2005-10-03 [paul] 1.9.14cvs67

	* src/send_message.c
		prevent hang on Cancel
		patch by Colin

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index b10359fb9c0e784e35c106c8cc6af902904c4230..55b80d4d701edc50a0421dea640d7f85832d92c9 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-10-03 [paul]      1.9.14cvs67
+
+       * src/send_message.c
+               prevent hang on Cancel
+               patch by Colin
+
 2005-10-03 [paul]      1.9.14cvs66
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 224ee550fd33e2e95809e40b4a727188803d1688..8fa899978d0581f4bab8353a7401caba9ac67d33 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -835,3 +835,4 @@
 ( cvs diff -u -r 1.8.2.9 -r 1.8.2.10 src/export.c;  cvs diff -u -r 1.13.2.9 -r 1.13.2.10 src/import.c;  cvs diff -u -r 1.28.2.9 -r 1.28.2.10 src/mbox.c;  ) > 1.9.14cvs64.patchset
 ( cvs diff -u -r 1.149.2.34 -r 1.149.2.35 src/inc.c;  ) > 1.9.14cvs65.patchset
 ( cvs diff -u -r 1.115.2.55 -r 1.115.2.56 src/main.c;  ) > 1.9.14cvs66.patchset
+( cvs diff -u -r 1.17.2.19 -r 1.17.2.20 src/send_message.c;  ) > 1.9.14cvs67.patchset

diff --git a/configure.ac b/configure.ac
index b0f98611b2485ee7f0b5940e11be21cefb4822b8..dd6fd93b3e5c25f55a397f79e325ac4efb8a4cf3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=66
+EXTRA_VERSION=67
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/send_message.c b/src/send_message.c
index d8c25007b270e150afeabb0c06c033a9488495ef..95d898261d48da48f5074dca7daa93faad011e46 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -374,7 +374,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
        if (!keep_session || ret != 0) {
                if (session_is_connected(session))
                        smtp_quit(smtp_session);
-               while (session_is_connected(session))
+               while (session_is_connected(session) && !dialog->cancelled)
                        gtk_main_iteration();
                session_destroy(session);
                ac_prefs->session = NULL;