2012-02-02 [pawel] 3.8.0cvs22

	* src/mainwindow.c
		Fix bug #2595
		'Change expand behavior for message list / message view'
		Patch by Christian Hesse

diff --git a/ChangeLog b/ChangeLog
index 78e4c17e57a824da72a32b1586c657179501ec8b..3c4251f871ae301a4ab5afd6037ccdfea7d646c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-02 [pawel]     3.8.0cvs22
+
+       * src/mainwindow.c
+               Fix bug #2595 
+               'Change expand behavior for message list / message view'
+               Patch by Christian Hesse
+
 2012-02-02 [pawel]     3.8.0cvs21
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index df3f0ca293d2280a76b24e40b96bb450478f8410..0164066297cb74cd064ed43a75b2b14f4d75e318 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4338,3 +4338,4 @@
 ( cvs diff -u -r 1.5.2.101 -r 1.5.2.102 src/gtk/gtkutils.c;  ) > 3.8.0cvs19.patchset
 ( cvs diff -u -r 1.18.2.33 -r 1.18.2.34 src/jpilot.c;  cvs diff -u -r 1.6.10.19 -r 1.6.10.20 src/mutt.c;  cvs diff -u -r 1.6.2.18 -r 1.6.2.19 src/pine.c;  cvs diff -u -r 1.150.2.120 -r 1.150.2.121 src/procmsg.c;  cvs diff -u -r 1.14.2.21 -r 1.14.2.22 src/vcard.c;  cvs diff -u -r 1.9.2.32 -r 1.9.2.33 src/gtk/sslcertwindow.c;  ) > 3.8.0cvs20.patchset
 ( cvs diff -u -r 1.213.2.204 -r 1.213.2.205 src/folder.c;  cvs diff -u -r 1.94.2.225 -r 1.94.2.226 src/messageview.c;  cvs diff -u -r 1.19.2.26 -r 1.19.2.27 src/messageview.h;  cvs diff -u -r 1.60.2.57 -r 1.60.2.58 src/procmsg.h;  ) > 3.8.0cvs21.patchset
+( cvs diff -u -r 1.274.2.341 -r 1.274.2.342 src/mainwindow.c;  ) > 3.8.0cvs22.patchset

diff --git a/configure.ac b/configure.ac
index ba6080e0bda7f0beb5c6508bf9da19410fa82a11..7daeb106b61a36c7bae6c698a0ea80da8e222aa6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=22
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 1ece79540c7881c796d05e6bbb960c98a417b5a0..0d16119e6f31939fa16e5c223d01cec6bab1b584 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3717,8 +3717,8 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
 
                if (messageview_is_visible(mainwin->messageview)) {
                        gtk_paned_add2(GTK_PANED(hpaned), vpaned);
-                       gtk_paned_add1(GTK_PANED(vpaned),
-                                      GTK_WIDGET_PTR(mainwin->summaryview));
+                       gtk_paned_pack1(GTK_PANED(vpaned),
+                                      GTK_WIDGET_PTR(mainwin->summaryview), TRUE, TRUE);
                } else {
                        gtk_paned_add2(GTK_PANED(hpaned),
                                       GTK_WIDGET_PTR(mainwin->summaryview));