2005-05-20 [colin] 1.9.11cvs2
authorColin Leroy <colin@colino.net>
Fri, 20 May 2005 16:24:27 +0000 (16:24 +0000)
committerColin Leroy <colin@colino.net>
Fri, 20 May 2005 16:24:27 +0000 (16:24 +0000)
        * src/procmsg.c
                Fix another compilation error with gcc-2.9x
                Thanks to Pawel Pekala <c0rn@gazeta.pl>
        * src/send_message.c
                Don't send QUIT if we aren't connected

AUTHORS
ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/procmsg.c
src/send_message.c

diff --git a/AUTHORS b/AUTHORS
index c066640..e888083 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -225,3 +225,4 @@ contributors (beside the above; based on Changelog)
        Markus Schwarzenberg
        Luca Cavalli
        Tim Mann
+       Pawel Pekala
index a0b5369..e1a3772 100644 (file)
@@ -1,3 +1,11 @@
+2005-05-20 [colin]     1.9.11cvs2
+
+       * src/procmsg.c
+               Fix another compilation error with gcc-2.9x
+               Thanks to Pawel Pekala <c0rn@gazeta.pl>
+       * src/send_message.c
+               Don't send QUIT if we aren't connected
+
 2005-05-19 [colin]     1.9.11cvs1
 
        * src/procmsg.c
index 80e5519..4ef9aad 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.274.2.38 -r 1.274.2.39 src/mainwindow.c; cvs diff -u -r 1.204.2.36 -r 1.204.2.37 src/prefs_common.c; cvs diff -u -r 1.103.2.15 -r 1.103.2.16 src/prefs_common.h; cvs diff -u -r 1.96.2.53 -r 1.96.2.54 src/textview.c; cvs diff -u -r 1.12.2.5 -r 1.12.2.6 src/textview.h; ) > 1.9.9cvs13.patchset
 ( cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/gtk/inputdialog.c; ) > 1.9.9cvs14.patchset
 ( cvs diff -u -r 1.150.2.23 -r 1.150.2.24 src/procmsg.c; ) > 1.9.11cvs1.patchset
+( cvs diff -u -r 1.150.2.24 -r 1.150.2.25 src/procmsg.c; cvs diff -u -r 1.17.2.9 -r 1.17.2.10 src/send_message.c; ) > 1.9.11cvs2.patchset
index 608b6c8..0b833af 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 9db1131..9f5817d 100644 (file)
@@ -722,9 +722,9 @@ parse_again:
        cur = orig;
        while (cur) {
                gchar *file;
+               PrefsAccount *ac = procmsg_get_account_from_file(file);
                msg = (MsgInfo *)cur->data;
                file = folder_item_fetch_msg(queue, msg->msgnum);
-               PrefsAccount *ac = procmsg_get_account_from_file(file);
                g_free(file);
 
                if (last_account == NULL || (ac != NULL && ac == last_account)) {
index 5681567..353ab70 100644 (file)
@@ -333,7 +333,8 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
         * easier.
         */
        if (!keep_session || ret != 0) {
-               smtp_quit(session);
+               if (session_is_connected(session))
+                       smtp_quit(session);
                while (session_is_connected(session))
                        gtk_main_iteration();
                session_destroy(session);