2007-03-26 [wwp] 2.8.1cvs53

	* src/procmsg.c
		Fix getting a false error when sending queued message
		whereas the sending was fine (if there are subfolders
		in the queue folder), thanks to Colin.

diff --git a/ChangeLog b/ChangeLog
index da3945378a01637a02a57021f9027cba6d0d565d..fa7ec54326d319fa19f02394ad57d9df671783c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-26 [wwp]       2.8.1cvs53
+
+       * src/procmsg.c
+               Fix getting a false error when sending queued message
+               whereas the sending was fine (if there are subfolders
+               in the queue folder), thanks to Colin.
+
 2007-03-26 [paul]      2.8.1cvs52
 
        * src/wizard.c

diff --git a/PATCHSETS b/PATCHSETS
index 1cdc6171fda6e3fe82edfc8bf40f9ae2b6b1562e..013602026692a5bfbb18309fbcc7605d0b891b13 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2469,3 +2469,4 @@
 ( cvs diff -u -r 1.115.2.148 -r 1.115.2.149 src/main.c;  ) > 2.8.1cvs50.patchset
 ( cvs diff -u -r 1.155.2.58 -r 1.155.2.59 src/Makefile.am;  ) > 2.8.1cvs51.patchset
 ( cvs diff -u -r 1.1.2.52 -r 1.1.2.53 src/wizard.c;  ) > 2.8.1cvs52.patchset
+( cvs diff -u -r 1.150.2.94 -r 1.150.2.95 src/procmsg.c;  ) > 2.8.1cvs53.patchset

diff --git a/configure.ac b/configure.ac
index 510aeb894d1f2bee7fea8c080f50747c398150a1..ca4a3c34c5e8717838c40ead876a37ca815ab60d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=52
+EXTRA_VERSION=53
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/procmsg.c b/src/procmsg.c
index 3b370aeed0fdaf6e10337a8c9a842cece2f52de3..588b896ca20229150b8aeea09be610e3e122631e 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -921,7 +921,9 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
                while (node != NULL) {
                        int res = 0;
                        next = node->next;
+                       send_queue_lock = FALSE;
                        res = procmsg_send_queue(FOLDER_ITEM(node->data), save_msgs, errstr);
+                       send_queue_lock = TRUE;
                        if (res < 0) 
                                err = -res;
                        else