[Commits] compose.c 1.382.2.592 1.382.2.593

[pawel at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv17450/src

Modified Files:
      Tag: gtk2
	compose.c 
Log Message:
2011-11-06 [pawel]	3.7.10cvs74

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

Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.592
retrieving revision 1.382.2.593
diff -u -d -r1.382.2.592 -r1.382.2.593
--- compose.c	1 Nov 2011 20:29:30 -0000	1.382.2.592
+++ compose.c	6 Nov 2011 13:59:23 -0000	1.382.2.593
@@ -7122,7 +7122,8 @@
 	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 @@
 	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 @@
 #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;
 	}