2011-11-06 [pawel] 3.7.10cvs74
authorPaweł Pękala <c0rn@gazeta.pl>
Sun, 6 Nov 2011 13:59:25 +0000 (13:59 +0000)
committerPaweł Pękala <c0rn@gazeta.pl>
Sun, 6 Nov 2011 13:59:25 +0000 (13:59 +0000)
* src/compose.c
Fix compose window size saving / restoring

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index 86d2495..74bbd04 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
index fa93593..8d56ac7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index ab7de4b..3966156 100644 (file)
@@ -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=
 
index df90f0c..38bccc6 100644 (file)
@@ -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;
        }