diff -Nru evolution-data-server-3.2.3/debian/changelog evolution-data-server-3.2.3/debian/changelog --- evolution-data-server-3.2.3/debian/changelog 2012-01-20 20:36:59.000000000 +0000 +++ evolution-data-server-3.2.3/debian/changelog 2012-02-02 14:30:22.000000000 +0000 @@ -1,3 +1,12 @@ +evolution-data-server (3.2.3-0ubuntu4) precise; urgency=low + + * debian/patches/name-selector-default-size.patch: set a default size to + the name selector window so it will display more than one address by + default. + (LP: #906872) + + -- Marc Deslauriers Thu, 02 Feb 2012 09:29:36 -0500 + evolution-data-server (3.2.3-0ubuntu3) precise; urgency=low * debian/patches/git_folder_migration_sql_error_cf05b71.patch: avoid diff -Nru evolution-data-server-3.2.3/debian/patches/name-selector-default-size.patch evolution-data-server-3.2.3/debian/patches/name-selector-default-size.patch --- evolution-data-server-3.2.3/debian/patches/name-selector-default-size.patch 1970-01-01 00:00:00.000000000 +0000 +++ evolution-data-server-3.2.3/debian/patches/name-selector-default-size.patch 2012-02-02 14:31:14.000000000 +0000 @@ -0,0 +1,44 @@ +Description: set a default size to the name selector window so it will + display more than one address by default. +Author: Mathieu Trudel-Lapierre +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/evolution-data-server/+bug/906872 +Forwarded: yes +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=669191 + +Index: evolution-data-server-3.2.3/libedataserverui/e-name-selector-dialog.c +=================================================================== +--- evolution-data-server-3.2.3.orig/libedataserverui/e-name-selector-dialog.c 2011-10-16 05:24:15.000000000 -0400 ++++ evolution-data-server-3.2.3/libedataserverui/e-name-selector-dialog.c 2012-02-02 00:30:55.923155204 -0500 +@@ -172,6 +172,7 @@ + GtkWidget *destination_box; + GtkWidget *status_message; + GtkWidget *source_combo; ++ int screen_height; + + name_selector_dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + name_selector_dialog, E_TYPE_NAME_SELECTOR_DIALOG, +@@ -422,9 +423,23 @@ + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, + NULL); + ++ /* Try to figure out a sane default size for the dialog. We used to hard ++ * code this to 512 so keep using 512 if the screen is big enough, ++ * otherwise use -1 (use as little as possible, use the ++ * GtkScrolledWindow's scrollbars). ++ * ++ * This should allow scrolling on tiny netbook resolutions and let ++ * others see as much of the dialog as possible. ++ * ++ * 600 pixels seems to be a good lower bound resolution to allow room ++ * above or below for other UI (window manager's?) ++ */ ++ screen_height = gdk_screen_get_height(gdk_screen_get_default()); ++ gtk_window_set_default_size (GTK_WINDOW (name_selector_dialog), 700, ++ screen_height >= 600 ? 512 : -1); ++ + gtk_dialog_set_default_response (GTK_DIALOG (name_selector_dialog), GTK_RESPONSE_CLOSE); + gtk_window_set_modal (GTK_WINDOW (name_selector_dialog), TRUE); +- gtk_window_set_default_size (GTK_WINDOW (name_selector_dialog), 700, -1); + gtk_window_set_resizable (GTK_WINDOW (name_selector_dialog), TRUE); + gtk_container_set_border_width (GTK_CONTAINER (name_selector_dialog), 4); + gtk_window_set_title (GTK_WINDOW (name_selector_dialog), _("Select Contacts from Address Book")); diff -Nru evolution-data-server-3.2.3/debian/patches/series evolution-data-server-3.2.3/debian/patches/series --- evolution-data-server-3.2.3/debian/patches/series 2012-01-20 20:36:59.000000000 +0000 +++ evolution-data-server-3.2.3/debian/patches/series 2012-02-02 14:29:24.000000000 +0000 @@ -3,3 +3,4 @@ gmodule_linking.patch remove_g_thread_init.patch git_folder_migration_sql_error_cf05b71.patch +name-selector-default-size.patch