talons

commit 0967e40e8848e1cd907ce35033f75e29704333c4
parent 22bd2ae584842e4147a0f5a6b958aa3fe2669e8d
Author: Colin Leroy <colin@colino.net>
Date:   Sun,  6 Nov 2011 21:21:22 +0000

2011-11-06 [colin]	3.7.10cvs75

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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
11
+----------

4 files changed, 9 insertions(+), 11 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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);