talons

commit a821e42bdb6ab57efe1e793f28016b2fbb10a703
parent e832dd4103a9e8364ac110ef2bd63aab4b37ae92
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 20 Dec 2010 12:54:02 +0000

2010-12-20 [colin]	3.7.8cvs13

	* src/mainwindow.c
		Don't iconify at start on w32. This un-iconifies in the
		background.

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

4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-20 [colin]	3.7.8cvs13
+
+	* src/mainwindow.c
+		Don't iconify at start on w32. This un-iconifies in the
+		background.
+
 2010-12-20 [colin]	3.7.8cvs12
 
 	* src/common/base64.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4086,3 +4086,4 @@
 ( cvs diff -u -r 1.382.2.561 -r 1.382.2.562 src/compose.c;  ) > 3.7.8cvs10.patchset
 ( cvs diff -u -r 1.4.2.21 -r 1.4.2.22 src/ldapserver.c;  ) > 3.7.8cvs11.patchset
 ( cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/common/base64.c;  ) > 3.7.8cvs12.patchset
+( cvs diff -u -r 1.274.2.319 -r 1.274.2.320 src/mainwindow.c;  ) > 3.7.8cvs13.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -2250,8 +2250,10 @@ 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);
@@ -3569,7 +3571,9 @@ 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));
+#endif
 		first_start = FALSE;
 	} else {
 		gtkut_window_popup(mainwin->window);