2008-06-09 [colin] 3.4.0cvs84

	* src/main.c
		Fix bug 1447, 'If user tries to close while starting
		up, it will not close ever.'

diff --git a/ChangeLog b/ChangeLog
index f67e2eba3ee4578ea0e8948f0a0c39865c3c5025..64c75fe13ec2a46fd6b03616d55ac21c1d101562 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-09 [colin]     3.4.0cvs84
+
+       * src/main.c
+               Fix bug 1447, 'If user tries to close while starting 
+               up, it will not close ever.'
+

 2008-06-09 [colin]     3.4.0cvs83
 
        * src/filtering.c
 2008-06-09 [colin]     3.4.0cvs83
 
        * src/filtering.c

diff --git a/PATCHSETS b/PATCHSETS
index 88cb47d5eaf7d60df039e27386e884d31d1729ee..c5b6ec9b26d0d164d589f68fe340f04367c791bf 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3379,3 +3379,4 @@
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/prefs_message.c;  ) > 3.4.0cvs81.patchset
 ( cvs diff -u -r 1.94.2.179 -r 1.94.2.180 src/messageview.c;  ) > 3.4.0cvs82.patchset
 ( cvs diff -u -r 1.60.2.44 -r 1.60.2.45 src/filtering.c;  ) > 3.4.0cvs83.patchset
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/prefs_message.c;  ) > 3.4.0cvs81.patchset
 ( cvs diff -u -r 1.94.2.179 -r 1.94.2.180 src/messageview.c;  ) > 3.4.0cvs82.patchset
 ( cvs diff -u -r 1.60.2.44 -r 1.60.2.45 src/filtering.c;  ) > 3.4.0cvs83.patchset

+( cvs diff -u -r 1.115.2.196 -r 1.115.2.197 src/main.c;  ) > 3.4.0cvs84.patchset

diff --git a/configure.ac b/configure.ac
index bff06d304b2f980ac44b45d334ded61a57b5e793..07ea96f8d9e831a057b2cb854372aa1533721e60 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=83
+EXTRA_VERSION=84

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index be0e3a17c7d40aadd2001d5615dadcd3c811f2e2..8885ad28db41e089fa51f466223426dc1a8c39fe 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1891,6 +1891,10 @@ void app_will_exit(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = data;
        
 {
        MainWindow *mainwin = data;
        

+       if (gtk_main_level() == 0) {
+               debug_print("not even started\n");
+               return;
+       }

        if (sc_exiting == TRUE) {
                debug_print("exit pending\n");
                return;
        if (sc_exiting == TRUE) {
                debug_print("exit pending\n");
                return;