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'

diff --git a/ChangeLog b/ChangeLog
index 876a4c259198d668836e91cf1f7570d17f63aade..b5438ec996c0bb325132b638599890e5d6bc38e6 100644 (file)
--- 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
index 43d70dafb9f753697cad1160abc14f96ed75a1b7..554ba8d055b83359236433dfadc7ab97c9fa6cb5 100644 (file)
--- 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
index e91c8ee60c00fb25b123822457d856ad63790da2..9baa279d1dfb86143efcf7fa8742727c1feaae59 100644 (file)
--- 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
index cd2207378e1143e50bfa91594768827f9b51501e..43733dc8840eda95003e096746008be6508b6a92 100644 (file)
--- 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();