aboutsummaryrefslogtreecommitdiffstats
path: root/mail/folder-browser.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/folder-browser.c')
-rw-r--r--mail/folder-browser.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 2f9c287fad..a59516d05a 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -1167,7 +1167,6 @@ folder_browser_set_message_preview (FolderBrowser *folder_browser, gboolean show
do_message_selected (folder_browser);
set_cursor_pos (folder_browser, y);
} else {
- gtk_paned_set_position (GTK_PANED (folder_browser->vpaned), 10000);
gtk_widget_hide (GTK_WIDGET (folder_browser->mail_display));
mail_display_set_message (folder_browser->mail_display, NULL, NULL, NULL);
folder_browser_ui_message_loaded (folder_browser);
@@ -2357,15 +2356,17 @@ on_cursor_activated (ETree *tree, int row, ETreePath path, gpointer user_data)
on_selection_changed ((GtkObject *)tree, user_data);
}
-static void
-fb_resize_cb (GtkWidget *w, GtkAllocation *a, FolderBrowser *fb)
+static gboolean
+fb_resize_cb (GtkWidget *w, GdkEventButton *e, FolderBrowser *fb)
{
GConfClient *gconf;
-
+
gconf = gconf_client_get_default ();
-
+
if (GTK_WIDGET_REALIZED (w) && fb->preview_shown)
- gconf_client_set_int (gconf, "/apps/evolution/mail/display/paned_size", a->height, NULL);
+ gconf_client_set_int (gconf, "/apps/evolution/mail/display/paned_size", gtk_paned_get_position (GTK_PANED (w)), NULL);
+
+ return FALSE;
}
static void
@@ -2374,12 +2375,12 @@ paned_size_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpoin
FolderBrowser *fb = user_data;
int paned_size;
- g_signal_handler_block (fb->message_list, fb->paned_resize_id);
+ g_signal_handler_block (fb->vpaned, fb->paned_resize_id);
paned_size = gconf_client_get_int (client, "/apps/evolution/mail/display/paned_size", NULL);
gtk_paned_set_position (GTK_PANED (fb->vpaned), paned_size);
- g_signal_handler_unblock (fb->message_list, fb->paned_resize_id);
+ g_signal_handler_unblock (fb->vpaned, fb->paned_resize_id);
}
static void
@@ -2475,9 +2476,9 @@ folder_browser_gui_init (FolderBrowser *fb)
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->message_list, "size-allocate",
+ fb->paned_resize_id = g_signal_connect (fb->vpaned, "button_release_event",
G_CALLBACK (fb_resize_cb), fb);
-
+
gconf = gconf_client_get_default ();
/* hide deleted */