2011-11-06 [colin] 3.7.10cvs75

	* src/mainwindow.c
		Don't iconify/deiconify. Instead, just show nothing
		before asked to.

diff --git a/ChangeLog b/ChangeLog
index 74bbd045a715204653ece27a2611facfc9cf3f67..3b40a4bf9ddca7138540ec7510b24c2458e35ff4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-06 [colin]     3.7.10cvs75
+
+       * src/mainwindow.c
+               Don't iconify/deiconify. Instead, just show nothing
+               before asked to.
+
 2011-11-06 [pawel]     3.7.10cvs74
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 8d56ac7efabfcf43172b5c22e21647aae59f87c1..3f438b6152271301954678d6fcec1e88df825693 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4278,3 +4278,4 @@
 ( 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
+( cvs diff -u -r 1.274.2.333 -r 1.274.2.334 src/mainwindow.c;  ) > 3.7.10cvs75.patchset

diff --git a/configure.ac b/configure.ac
index 3966156ff9c97f2521d1887acfc0762b6d7ed32a..c6fa38491ccd7c393683402ea23053f33167c390 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=74
+EXTRA_VERSION=75
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index c05f070b3f149e826a82547f9214f0e38f40b51b..e1b005021151a353f475552fdf5eb9b69f8a9b6b 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2278,12 +2278,6 @@ MainWindow *main_window_create()
 
        ADD_MENU_ACCEL_GROUP_TO_WINDOW(summaryview->popupmenu, mainwin->window);
        
-#ifndef GENERIC_UMPC
-#ifdef G_OS_UNIX
-       gtk_window_iconify(GTK_WINDOW(mainwin->window));
-#endif
-#endif
-
        g_signal_connect(G_OBJECT(window), "window_state_event",
                         G_CALLBACK(mainwindow_state_event_cb), mainwin);
        g_signal_connect(G_OBJECT(window), "visibility_notify_event",
@@ -3612,14 +3606,11 @@ void main_window_popup(MainWindow *mainwin)
                gtk_window_maximize(GTK_WINDOW(mainwin->window));
 
        if (first_start) {
-#ifdef G_OS_UNIX
-               gtk_window_deiconify(GTK_WINDOW(mainwin->window));
-               gtk_window_present(GTK_WINDOW(mainwin->window));
-#endif
                first_start = FALSE;
        } else {
                gtkut_window_popup(mainwin->window);
        }
+
        if (prefs_common.layout_mode == SMALL_LAYOUT) {
                if (mainwin->in_folder) {
                        mainwindow_enter_folder(mainwin);