2007-12-27 [colin] 3.2.0cvs18

	* src/mainwindow.c
		Maximise before showing to avoid probable flickering
		on slow computers.

diff --git a/ChangeLog b/ChangeLog
index 3e914c1c69293b0e23df0ca28d85f420ad8f21ae..b7b9a7eba877aa28776253a7a61a97073a035440 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-27 [colin]     3.2.0cvs18
+
+       * src/mainwindow.c
+               Maximise before showing to avoid probable flickering
+               on slow computers.
+
 2007-12-27 [colin]     3.2.0cvs17
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 1eab53095c31c58b54ee066badae3f8cf25d433b..f3021cdebbf3010620d41918f15525825a05bffb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3154,3 +3154,4 @@
 ( cvs diff -u -r 1.382.2.427 -r 1.382.2.428 src/compose.c;  ) > 3.2.0cvs15.patchset
 ( cvs diff -u -r 1.43.2.69 -r 1.43.2.70 src/prefs_matcher.c;  ) > 3.2.0cvs16.patchset
 ( cvs diff -u -r 1.115.2.178 -r 1.115.2.179 src/main.c;  cvs diff -u -r 1.274.2.225 -r 1.274.2.226 src/mainwindow.c;  cvs diff -u -r 1.204.2.159 -r 1.204.2.160 src/prefs_common.c;  cvs diff -u -r 1.103.2.103 -r 1.103.2.104 src/prefs_common.h;  ) > 3.2.0cvs17.patchset
+( cvs diff -u -r 1.274.2.226 -r 1.274.2.227 src/mainwindow.c;  ) > 3.2.0cvs18.patchset

diff --git a/configure.ac b/configure.ac
index 1c1353f8f45fc555cb4c7925cbe70a94de7e022f..9a1d5e156db96af9ad1cd60b768fa1b008adc72b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index dfd9aa2df121c54784100323ea97364a7fb2e7a2..581a67b4f75b7c4cb048e874a1f005c67615b6b5 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3122,11 +3122,11 @@ void main_window_popup(MainWindow *mainwin)
        if (!GTK_WIDGET_VISIBLE(GTK_WIDGET(mainwin->window)))
                main_window_show(mainwin);
 
-       gtkut_window_popup(mainwin->window);
-
        if (prefs_common.mainwin_maximised)
                gtk_window_maximize(GTK_WINDOW(mainwin->window));
 
+       gtkut_window_popup(mainwin->window);
+
        if (prefs_common.layout_mode == SMALL_LAYOUT) {
                if (mainwin->in_folder) {
                        mainwindow_enter_folder(mainwin);