2007-05-30 [colin] 2.9.2cvs18

	* src/compose.c
		Fix race where it's possible to re-click Send
		between end of SMTP session and end of "move to
		sent folder" when sending an email with send
		dialog enabled.

diff --git a/ChangeLog b/ChangeLog
index 336a0842e7633e87cd66fba5357b504b87a5935d..d3fed094730fda19c7e5b3bd9b848eaa3fdc3c96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-30 [colin]     2.9.2cvs18
+
+       * src/compose.c
+               Fix race where it's possible to re-click Send
+               between end of SMTP session and end of "move to
+               sent folder" when sending an email with send
+               dialog enabled.
+
 2007-05-30 [colin]     2.9.2cvs17
 
        * src/crash.c

diff --git a/PATCHSETS b/PATCHSETS
index 8502802dbdd6f448f8f002f2c3dfb27f5d1eca62..c86a34b8380e75c6bd0eccba6409b7efe694b84d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2593,3 +2593,4 @@
 ( cvs diff -u -r 1.13.2.31 -r 1.13.2.32 src/common/socket.c;  ) > 2.9.2cvs15.patchset
 ( cvs diff -u -r 1.179.2.174 -r 1.179.2.175 src/imap.c;  ) > 2.9.2cvs16.patchset
 ( cvs diff -u -r 1.23.2.23 -r 1.23.2.24 src/crash.c;  cvs diff -u -r 1.207.2.162 -r 1.207.2.163 src/folderview.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/ldapupdate.c;  ) > 2.9.2cvs17.patchset
+( cvs diff -u -r 1.382.2.380 -r 1.382.2.381 src/compose.c;  ) > 2.9.2cvs18.patchset

diff --git a/configure.ac b/configure.ac
index 1ee71e6a4939ea72dee39a57a8053a2ab619b1e6..9826885bd9aac65ca73e917e46ab67a3e52728b4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index ca4eeb45092d04c7f146ad74a1b7480883228638..9b01223ddb353e5d73dcff7a391ac34c88295909 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4406,8 +4406,6 @@ gint compose_send(Compose *compose)
                g_free(msgpath);
        }
        if (!discard_window) {
-               compose->sending = FALSE;
-               compose_allow_user_actions (compose, TRUE);
                if (val != 0) {
                        if (!queued_removed)
                                folder_item_remove_msg(folder, msgnum);
@@ -4437,8 +4435,11 @@ gint compose_send(Compose *compose)
                                procmsg_msginfo_free(tmp);
                        }
                }
-               if (!discard_window)
+               if (!discard_window) {
+                       compose->sending = FALSE;
+                       compose_allow_user_actions (compose, TRUE);
                        compose_close(compose);
+               }
        } else {
                if (errstr) {
                        gchar *tmp = g_strdup_printf(_("%s\nUse \"Send queued messages\" from "