2004-09-29 [colin] 0.9.12cvs114

	* src/compose.c
		Don't close compose until message is sent if
		Show Send Dialog is Always

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7edcd8ac5b3e6a43984d8453768e5c2c28a8ffbd..290d037d63342e6e7a141306246ac89b2a5cd917 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-09-29 [colin]     0.9.12cvs114
+
+       * src/compose.c
+               Don't close compose until message is sent if 
+               Show Send Dialog is Always
+
 2004-09-29 [paul]      0.9.12cvs113
 
        * src/quote_fmt_parse.y

diff --git a/PATCHSETS b/PATCHSETS
index 7ce4a39ca6ba5a5e113df7826d3336c5c47cb360..6888268c29dd496f0aa27aa72cafa60ed82aba34 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -96,3 +96,4 @@
 ( cvs diff -u -r 1.308 -r 1.309 src/mainwindow.c; ) > 0.9.12cvs111.patchset
 ( cvs diff -u -r 1.309 -r 1.310 src/mainwindow.c; cvs diff -u -r 1.247 -r 1.248 src/folderview.c; ) > 0.9.12cvs112.patchset
 ( cvs diff -u -r 1.24 -r 1.25 src/quote_fmt_parse.y; ) > 0.9.12cvs113.patchset
+( cvs diff -u -r 1.441 -r 1.442 src/compose.c; ) > 0.9.12cvs114.patchset

diff --git a/configure.ac b/configure.ac
index faf18d2ea8c712f0cd740e441045b19e7c25f086..95bd951f13303b4208d0b863c9efb885c0ecf3f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=113
+EXTRA_VERSION=114
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/compose.c b/src/compose.c
index cf3635c684990b84c8baa5db97dea279482067ed..99798199bf90ec4510c3a5ee0f5e5af553269d9b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3154,14 +3154,22 @@ gint compose_send(Compose *compose)
                goto bail;
        }
 
-       compose->sending = FALSE;       
-       gtk_widget_destroy(compose->window);
-       /* No more compose access in the normal codepath after this point! */
+
+       if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS) {
+               compose->sending = FALSE;
+               gtk_widget_destroy(compose->window);
+               /* No more compose access in the normal codepath 
+                * after this point! */
+       }
 
        if (msgnum == 0) {
                alertpanel_error(_("The message was queued but could not be "
                                   "sent.\nUse \"Send queued messages\" from "
                                   "the main window to retry."));
+               if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+                       compose->sending = FALSE;
+                       compose_allow_user_actions (compose, TRUE);
+               }
                return 0;
        }
        
@@ -3169,9 +3177,20 @@ gint compose_send(Compose *compose)
        val = procmsg_send_message_queue(msgpath);
        g_free(msgpath);
 
+       if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+               compose->sending = FALSE;
+               compose_allow_user_actions (compose, TRUE);
+               if (val != 0) {
+                       folder_item_remove_msg(folder, msgnum);
+                       folder_item_scan(folder);
+               }
+       }
+
        if (val == 0) {
                folder_item_remove_msg(folder, msgnum);
                folder_item_scan(folder);
+               if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS)
+                       gtk_widget_destroy(compose->window);
        }
 
        return 0;