talons

commit 92d60110d472a352ae22257a50984348eb4758b9
parent f83b27f5a3de62a2e1fea2d28c052ce4d63a5ecd
Author: Colin Leroy <colin@colino.net>
Date:   Fri,  6 Feb 2009 06:45:11 +0000

2009-02-06 [colin]	3.7.0cvs54

	* src/mainwindow.c
		Fix hardcoded Shift-Q quits. Fixes
		bug 1838, 'Claws-Mail sometimes quits
		when attempting to type a capital Q'

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

4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-06 [colin]	3.7.0cvs54
+
+	* src/mainwindow.c
+		Fix hardcoded Shift-Q quits. Fixes
+		bug 1838, 'Claws-Mail sometimes quits 
+		when attempting to type a capital Q'
+
 2009-01-31 [paul]	3.7.0cvs53
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3715,3 +3715,4 @@
 ( cvs diff -u -r 1.94.2.197 -r 1.94.2.198 src/messageview.c;  ) > 3.7.0cvs51.patchset
 ( cvs diff -u -r 1.274.2.296 -r 1.274.2.297 src/mainwindow.c;  ) > 3.7.0cvs52.patchset
 ( cvs diff -u -r 1.382.2.497 -r 1.382.2.498 src/compose.c;  ) > 3.7.0cvs53.patchset
+( cvs diff -u -r 1.274.2.297 -r 1.274.2.298 src/mainwindow.c;  ) > 3.7.0cvs54.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -1312,9 +1312,13 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
 
 	switch (event->keyval) {
 	case GDK_Q:             /* Quit */
+#ifndef MAEMO
 		BREAK_ON_MODIFIER_KEY();
 
-		app_exit_cb(NULL, mainwin);
+		if (gtk_window_is_active(GTK_WINDOW(mainwin->window))) {
+			app_exit_cb(NULL, mainwin);
+		}
+#endif
 		return FALSE;
 	case GDK_space:
 		BREAK_ON_MODIFIER_KEY();