aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2006-07-21 14:03:01 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2006-07-21 14:03:01 +0800
commit28c03180142980ddfaa90379fb8992fed1534a21 (patch)
treea1e450b0a706d23f491c8b8ccedfd38acbace030
parent7dce87e7ba17789c2c25e8b59166993b63f8d005 (diff)
downloadgsoc2013-evolution-28c03180142980ddfaa90379fb8992fed1534a21.tar
gsoc2013-evolution-28c03180142980ddfaa90379fb8992fed1534a21.tar.gz
gsoc2013-evolution-28c03180142980ddfaa90379fb8992fed1534a21.tar.bz2
gsoc2013-evolution-28c03180142980ddfaa90379fb8992fed1534a21.tar.lz
gsoc2013-evolution-28c03180142980ddfaa90379fb8992fed1534a21.tar.xz
gsoc2013-evolution-28c03180142980ddfaa90379fb8992fed1534a21.tar.zst
gsoc2013-evolution-28c03180142980ddfaa90379fb8992fed1534a21.zip
Fixes bug #346316
svn path=/trunk/; revision=32367
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-folder-browser.c15
2 files changed, 15 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 08ef99acc4..34665d217a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-21 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fixes bug #346316
+
+ * em-folder-browser.c: (em_folder_browser_show_wide): Redraw the child
+ widgets and pack it accordingly.
+
2006-07-20 Srinivasa Ragavan <sragavan@novell.com>
* em-format-html-display.c: (efhd_attachment_bar_refresh): Modified
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 9925abb3f0..5236b3302c 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -604,10 +604,10 @@ void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state)
void em_folder_browser_show_wide(EMFolderBrowser *emfb, gboolean state)
{
GtkWidget *w;
+ int paned_size;
if ((emfb->priv->show_wide && state)
- || emfb->view.list == NULL
- || emfb->view.preview_active == 0) {
+ || emfb->view.list == NULL) {
emfb->priv->show_wide = state;
return;
}
@@ -620,16 +620,17 @@ void em_folder_browser_show_wide(EMFolderBrowser *emfb, gboolean state)
g_signal_connect(w, "realize", G_CALLBACK(emfb_pane_realised), emfb);
emfb->priv->vpane_resize_id = g_signal_connect(w, "button_release_event", G_CALLBACK(emfb_pane_button_release_event), emfb);
- gtk_widget_show(w);
- if (emfb->priv->show_wide)
- gtk_paned_set_position((GtkPaned *)w, gconf_client_get_int(mail_config_get_gconf_client (), "/apps/evolution/mail/display/hpaned_size", NULL));
- else
- gtk_paned_set_position((GtkPaned *)w, gconf_client_get_int(mail_config_get_gconf_client (), "/apps/evolution/mail/display/paned_size", NULL));
gtk_box_pack_start_defaults((GtkBox *)emfb, w);
gtk_widget_reparent((GtkWidget *)emfb->view.list, w);
gtk_widget_reparent((GtkWidget *)emfb->priv->preview, w);
gtk_widget_destroy(emfb->vpane);
+ gtk_container_resize_children (w);
emfb->vpane = w;
+ gtk_widget_show(w);
+
+ paned_size = gconf_client_get_int(mail_config_get_gconf_client(), emfb->priv->show_wide ? "/apps/evolution/mail/display/hpaned_size":"/apps/evolution/mail/display/paned_size", NULL);
+ gtk_paned_set_position (GTK_PANED (emfb->vpane), paned_size);
+
if (((EMFolderView *)emfb)->folder)
em_folder_view_setup_view_instance ((EMFolderView *) emfb);
}