2009-04-05 [colin] 3.7.1cvs40

	* src/procmsg.c
		Don't ask whether we want to send deleted mails in queue
		folders; also, don't send deleted mails when flushing
		queues

diff --git a/ChangeLog b/ChangeLog
index c5e006310724ce79f5912fb3b4b17be6b6383b3a..365a6aafe0584de9d2f1af6d0d4342698e69ab94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-05 [colin]     3.7.1cvs40
+
+       * src/procmsg.c
+               Don't ask whether we want to send deleted mails in queue
+               folders; also, don't send deleted mails when flushing
+               queues
+
 2009-04-04 [paul]      3.7.1cvs39
 
        * AUTHORS

diff --git a/PATCHSETS b/PATCHSETS
index 67870fa832f1d037b6d6455fbecd5df55c1295ee..cf95c812f8bb83010c06c0b75551e19a37365f54 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3779,3 +3779,4 @@
 ( cvs diff -u -r 1.382.2.505 -r 1.382.2.506 src/compose.c;  cvs diff -u -r 1.96.2.218 -r 1.96.2.219 src/textview.c;  ) > 3.7.1cvs37.patchset
 ( cvs diff -u -r 1.100.2.66 -r 1.100.2.67 AUTHORS;  cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/gtk/authors.h;  ) > 3.7.1cvs38.patchset
 ( cvs diff -u -r 1.100.2.67 -r 1.100.2.68 AUTHORS;  cvs diff -u -r 1.654.2.3846 -r 1.654.2.3847 configure.ac;  diff -u /dev/null po/id.po;  cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/gtk/authors.h;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 tools/claws.i18n.status.pl;  ) > 3.7.1cvs39.patchset
+( cvs diff -u -r 1.150.2.114 -r 1.150.2.115 src/procmsg.c;  ) > 3.7.1cvs40.patchset

diff --git a/configure.ac b/configure.ac
index c1fc03cf3d6e08ed0473ddbe5a590fbdcdf4b1aa..04bef64bb8f154c789b48b362ec218b592e0a32a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/procmsg.c b/src/procmsg.c
index 395879b09e858fe42970a9c50104dea26d8443b2..1daa89ad90dc1a732496a7dbc4d0cf7c72920d02 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -890,7 +890,7 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
                MsgInfo *msginfo;
                        
                msginfo = (MsgInfo *)(elem->data);
-               if (!MSG_IS_LOCKED(msginfo->flags)) {
+               if (!MSG_IS_LOCKED(msginfo->flags) && !MSG_IS_DELETED(msginfo->flags)) {
                        file = folder_item_fetch_msg(queue, msginfo->msgnum);
                        if (file) {
                                gboolean queued_removed = FALSE;
@@ -2397,8 +2397,23 @@ static void item_has_queued_mails(FolderItem *item, gpointer data)
        gboolean *result = (gboolean *)data;
        if (*result == TRUE)
                return;
-       if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0)
-               *result = TRUE;
+       if (folder_has_parent_of_type(item, F_QUEUE)) {
+               if (item->total_msgs == 0)
+                       return;
+               else {
+                       GSList *msglist = folder_item_get_msg_list(item);
+                       GSList *cur;
+                       for (cur = msglist; cur; cur = cur->next) {
+                               MsgInfo *msginfo = (MsgInfo *)cur->data;
+                               if (!MSG_IS_DELETED(msginfo->flags) &&
+                                   !MSG_IS_LOCKED(msginfo->flags)) {
+                                       *result = TRUE;
+                                       break;
+                               }
+                       }
+                       procmsg_msg_list_free(msglist);
+               }
+       }
 }
 
 gboolean procmsg_have_queued_mails_fast (void)