2011-11-06 [pawel] 3.7.10cvs74

	* src/compose.c
		Fix compose window size saving / restoring

diff --git a/ChangeLog b/ChangeLog
index 86d2495b9ab4b82227b11d72d82fd9bc31442bdd..74bbd045a715204653ece27a2611facfc9cf3f67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-06 [pawel]     3.7.10cvs74
+
+       * src/compose.c
+               Fix compose window size saving / restoring
+
 2011-11-06 [pawel]     3.7.10cvs73
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index fa93593bdffd3e466d71486c0bd93afb0178046a..8d56ac7efabfcf43172b5c22e21647aae59f87c1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4277,3 +4277,4 @@
 ( cvs diff -u -r 1.9.2.75 -r 1.9.2.76 src/gtk/gtkaspell.c;  ) > 3.7.10cvs71.patchset
 ( cvs diff -u -r 1.9.2.76 -r 1.9.2.77 src/gtk/gtkaspell.c;  ) > 3.7.10cvs72.patchset
 ( cvs diff -u -r 1.83.2.177 -r 1.83.2.178 src/mimeview.c;  cvs diff -u -r 1.94.2.222 -r 1.94.2.223 src/messageview.c;  ) > 3.7.10cvs73.patchset
+( cvs diff -u -r 1.382.2.592 -r 1.382.2.593 src/compose.c;  ) > 3.7.10cvs74.patchset

diff --git a/configure.ac b/configure.ac
index ab7de4b043be955c675fa1a472a39a7bc79486f1..3966156ff9c97f2521d1887acfc0762b6d7ed32a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=73
+EXTRA_VERSION=74
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index df90f0cb211cf6cc28862a8d80c2136d517df3a9..38bccc60736e4907263f25b37e57c93178d0881c 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -7122,7 +7122,8 @@ static Compose *compose_create(PrefsAccount *account,
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose");
 
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
-       gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
+       gtk_widget_set_size_request(window, prefs_common.compose_width,
+                                       prefs_common.compose_height);
 
        if (!geometry.max_width) {
                geometry.max_width = gdk_screen_width();
@@ -7453,7 +7454,6 @@ static Compose *compose_create(PrefsAccount *account,
        gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
                                            GTK_SHADOW_IN);
        gtk_box_pack_start(GTK_BOX(edit_vbox), scrolledwin, TRUE, TRUE, 0);
-       gtk_widget_set_size_request(scrolledwin, prefs_common.compose_width, -1);
 
        text = gtk_text_view_new();
        if (prefs_common.show_compose_margin) {
@@ -8416,7 +8416,7 @@ static void compose_destroy(Compose *compose)
 #endif
 
        if (!compose->batch) {
-               gtk_widget_get_allocation(compose->scrolledwin, &allocation);
+               gtk_widget_get_allocation(compose->window, &allocation);
                prefs_common.compose_width = allocation.width;
                prefs_common.compose_height = allocation.height;
        }