talons

commit d73cf6ded021d62811da31ca1773b7e06568d76e
parent 482e58b51917866b26a5bf6f29a079defb4d6a42
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 10 Apr 2011 08:06:18 +0000

2011-04-10 [colin]	3.7.9cvs2

	* src/mainwindow.c
		Use gtkut_window_popup() to work around a bug in Gnome Shell.
		This is the patch from bug #2396, it should be innocuous even
		if that's useless to do deiconify + present window...

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

4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-10 [colin]	3.7.9cvs2
+
+	* src/mainwindow.c
+		Use gtkut_window_popup() to work around a bug in Gnome Shell.
+		This is the patch from bug #2396, it should be innocuous even
+		if that's useless to do deiconify + present window...
+
 2011-04-09 [paul]	3.7.9cvs1
 
 	* src/prefs_summaries.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4153,3 +4153,4 @@
 ( cvs diff -u -r 1.2.2.43 -r 1.2.2.44 src/gtk/filesel.c;  ) > 3.7.8cvs77.patchset
 ( cvs diff -u -r 1.9.2.20 -r 1.9.2.21 po/cs.po;  cvs diff -u -r 1.60.2.62 -r 1.60.2.63 po/es.po;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 po/fi.po;  cvs diff -u -r 1.42.2.53 -r 1.42.2.54 po/fr.po;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/lt.po;  cvs diff -u -r 1.50.2.40 -r 1.50.2.41 po/pt_BR.po;  cvs diff -u -r 1.2.2.31 -r 1.2.2.32 po/sk.po;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/uk.po;  ) > 3.7.8cvs78.patchset
 ( cvs diff -u -r 1.1.2.65 -r 1.1.2.66 src/prefs_summaries.c;  ) > 3.7.9cvs1.patchset
+( cvs diff -u -r 1.274.2.321 -r 1.274.2.322 src/mainwindow.c;  ) > 3.7.9cvs2.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -3573,6 +3573,7 @@ void main_window_popup(MainWindow *mainwin)
 	if (first_start) {
 #ifdef G_OS_UNIX
 		gtk_window_deiconify(GTK_WINDOW(mainwin->window));
+		gtkut_window_popup(mainwin->window);
 #endif
 		first_start = FALSE;
 	} else {