2006-08-11 [wwp] 2.4.0cvs40

	* src/main.c
		fix a logic issue when quitting while a compose window is
		still open, thanks to Colin.

diff --git a/ChangeLog b/ChangeLog
index ee86c2f835e4fed9df0d4750f113b4e1071fb3ab..4b9c93787a15279b6afaf54bd6d3f64d1f18bf69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-11 [wwp]       2.4.0cvs40
+
+       * src/main.c
+               fix a logic issue when quitting while a compose window is
+               still open, thanks to Colin.
+
 2006-08-10 [colin]     2.4.0cvs39
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 53d183ddddc15c35c5a98f010f7e98a9b8e6ba31..40b1972bee61b623b0a51928a5f628878a98ea56 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1731,3 +1731,4 @@
 ( cvs diff -u -r 1.94.2.96 -r 1.94.2.97 src/messageview.c;  cvs diff -u -r 1.60.2.38 -r 1.60.2.39 src/prefs_actions.c;  cvs diff -u -r 1.59.2.39 -r 1.59.2.40 src/prefs_filtering.c;  cvs diff -u -r 1.1.4.27 -r 1.1.4.28 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.42 -r 1.43.2.43 src/prefs_matcher.c;  cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/plugins/clamav/clamav_plugin_gtk.c;  ) > 2.4.0cvs37.patchset
 ( cvs diff -u -r 1.274.2.135 -r 1.274.2.136 src/mainwindow.c;  cvs diff -u -r 1.39.2.18 -r 1.39.2.19 src/mainwindow.h;  ) > 2.4.0cvs38.patchset
 ( cvs diff -u -r 1.179.2.127 -r 1.179.2.128 src/imap.c;  cvs diff -u -r 1.115.2.100 -r 1.115.2.101 src/main.c;  cvs diff -u -r 1.1.4.46 -r 1.1.4.47 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/etpan/imap-thread.h;  ) > 2.4.0cvs39.patchset
+( cvs diff -u -r 1.115.2.101 -r 1.115.2.102 src/main.c;  ) > 2.4.0cvs40.patchset

diff --git a/configure.ac b/configure.ac
index 5ee4d0ad137b17f6d02469401597d4eae7b24f9a..a20a4e8c616dab9bdc570c929cd4b7427dbb6880 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index fef7bb54307b4848b24c36b6606ef7090e92812c..c50425127ac3c5fcab2b61d33a756cf792b86983 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -966,6 +966,7 @@ void app_will_exit(GtkWidget *widget, gpointer data)
                               _("_Save to Draft"), _("_Discard them"), _("Do_n't quit"));
                switch (val) {
                        case G_ALERTOTHER:
+                               sc_exiting = FALSE;
                                return;
                        case G_ALERTALTERNATE:
                                break;
@@ -981,6 +982,7 @@ void app_will_exit(GtkWidget *widget, gpointer data)
                               _("Some unsent messages are queued. Exit now?"),
                               GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL)
                    != G_ALERTALTERNATE) {
+                       sc_exiting = FALSE;
                        return;
                }
                manage_window_focus_in(mainwin->window, NULL, NULL);