From 40b2d61435ab9f8b5175f0e93490551c6f96c7a2 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Thu, 27 Mar 2003 02:58:23 +0000 Subject: dont set the paned initial size here, but hook onto the realize signal. 2003-03-27 Not Zed * folder-browser.c (folder_browser_gui_init): dont set the paned initial size here, but hook onto the realize signal. (paned_realised): set the paned size once we're realised. Fixes #37084, its a bit of a hack, but it seems to work. svn path=/trunk/; revision=20536 --- mail/ChangeLog | 7 +++++++ mail/folder-browser.c | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 4a461578b6..b208623cca 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2003-03-27 Not Zed + + * folder-browser.c (folder_browser_gui_init): dont set the paned + initial size here, but hook onto the realize signal. + (paned_realised): set the paned size once we're realised. Fixes + #37084, its a bit of a hack, but it seems to work. + 2003-03-26 Jeffrey Stedfast Fixes bug #40074. diff --git a/mail/folder-browser.c b/mail/folder-browser.c index eeb464803a..0327ef0c7e 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -2320,16 +2320,25 @@ fb_resize_cb (GtkWidget *w, GdkEventButton *e, FolderBrowser *fb) return FALSE; } +/* hack to get around the fact setting the paned size doesn't work */ +static void +paned_realised(GtkWidget *w, FolderBrowser *fb) +{ + int size; + + size = gconf_client_get_int (gconf_client_get_default (), "/apps/evolution/mail/display/paned_size", NULL); + gtk_paned_set_position (GTK_PANED (fb->vpaned), size); +} + static void folder_browser_gui_init (FolderBrowser *fb) { extern RuleContext *search_context; ESelectionModel *esm; - GConfClient *gconf; - int paned_size; /* The panned container */ fb->vpaned = gtk_vpaned_new (); + g_signal_connect(fb->vpaned, "realize", G_CALLBACK(paned_realised), fb); gtk_widget_show (fb->vpaned); gtk_table_attach (GTK_TABLE (fb), fb->vpaned, @@ -2367,17 +2376,14 @@ folder_browser_gui_init (FolderBrowser *fb) g_signal_connect (esm, "selection_changed", G_CALLBACK (on_selection_changed), fb); g_signal_connect (esm, "cursor_activated", G_CALLBACK (on_cursor_activated), fb); fb->selection_state = FB_SELSTATE_NONE; /* default to none */ - + gtk_paned_add1 (GTK_PANED (fb->vpaned), GTK_WIDGET (fb->message_list)); gtk_widget_show (GTK_WIDGET (fb->message_list)); fb->paned_resize_id = g_signal_connect (fb->vpaned, "button_release_event", G_CALLBACK (fb_resize_cb), fb); - gconf = gconf_client_get_default (); - paned_size = gconf_client_get_int (gconf, "/apps/evolution/mail/display/paned_size", NULL); gtk_paned_add2 (GTK_PANED (fb->vpaned), GTK_WIDGET (fb->mail_display)); - gtk_paned_set_position (GTK_PANED (fb->vpaned), paned_size); gtk_widget_show (GTK_WIDGET (fb->mail_display)); gtk_widget_show (GTK_WIDGET (fb)); } -- cgit v1.2.3