* src/main.c

* src/toolbar.c
* src/procmsg.c
	don't send locked queue messages
	(feature request "[ 705245 ] Locking message in outbox
	 should prevent sending")

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9e6da3add4b9e15be853648ce31c8bad8edb44f3..ace0122e6606ca03ecf4f41588aa1717efed173c 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2003-03-20 [alfons]    0.8.11claws34
+
+       * src/main.c
+       * src/toolbar.c
+       * src/procmsg.c
+               don't send locked queue messages
+               (feature request "[ 705245 ] Locking message in outbox 
+                should prevent sending")
+
 2003-03-20 [christoph] 0.8.11claws33
 
        * src/folder.c

diff --git a/configure.ac b/configure.ac
index 5683e8c649e3c7afbd7a43f5bff939539140d5a9..6b31cc46d653df20cc992289239197252718ddec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws33
+EXTRA_VERSION=claws34
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/main.c b/src/main.c
index a18a620bc5ddd013898fbd4ba4d231d6089c058a..2cd5a013019c0e2b921a68ba48d89877400c5272 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -797,10 +797,13 @@ static void send_queue(void)
                Folder *folder = list->data;
 
                if (folder->queue) {
-                       if (procmsg_send_queue
-                               (folder->queue, prefs_common.savemsg) < 0)
+                       gint res = procmsg_send_queue
+                               (folder->queue, prefs_common.savemsg);
+
+                       if (res < 0)    
                                alertpanel_error(_("Some errors occurred while sending queued messages."));
-                       folder_item_scan(folder->queue);
+                       if (res)        
+                               folder_item_scan(folder->queue);
                        if (prefs_common.savemsg && folder->outbox) {
                                if (folder->outbox == def_outbox)
                                        def_outbox = NULL;

diff --git a/src/procmsg.c b/src/procmsg.c
index f6266dbe238844933cf246167f7bda140e2c7fd2..f650ef2698b0792bf2ee09ba5e636a0ecd588c46 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -464,9 +464,18 @@ void procmsg_empty_trash(void)
        }
 }
 
+/*!
+ *\brief       Send messages in queue
+ *
+ *\param       queue Queue folder to process
+ *\param       save_msgs Unused
+ *
+ *\return      Number of messages sent, negative if an error occurred
+ *             positive if no error occurred
+ */
 gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
 {
-       gint ret = 0;
+       gint ret = 1, count = 0;
        GSList *list, *elem;
 
        if (!queue)
@@ -476,37 +485,42 @@ gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
        folder_item_scan(queue);
        list = folder_item_get_msg_list(queue);
 
-
        for (elem = list; elem != NULL; elem = elem->next) {
                gchar *file;
                MsgInfo *msginfo;
                
                msginfo = (MsgInfo *)(elem->data);
-
-               file = folder_item_fetch_msg(queue, msginfo->msgnum);
-               if (file) {
-                       if (procmsg_send_message_queue(file) < 0) {
-                               g_warning("Sending queued message %d failed.\n", msginfo->msgnum);
-                               ret = -1;
-                       } else {
-                       /* CLAWS: 
-                        * We save in procmsg_send_message_queue because
-                        * we need the destination folder from the queue
-                        * header
-                                               
-                               if (save_msgs)
-                                       procmsg_save_to_outbox
-                                               (queue->folder->outbox,
-                                                file, TRUE);
-*/
-                               folder_item_remove_msg(queue, msginfo->msgnum);
+               if (!MSG_IS_LOCKED(msginfo->flags)) {
+                       file = folder_item_fetch_msg(queue, msginfo->msgnum);
+                       if (file) {
+                               if (procmsg_send_message_queue(file) < 0) {
+                                       g_warning("Sending queued message %d failed.\n", 
+                                                 msginfo->msgnum);
+                                       ret = -1;
+                               } else {
+                                       /* CLAWS: 
+                                        * We save in procmsg_send_message_queue because
+                                        * we need the destination folder from the queue
+                                        * header
+                                                       
+                                       if (save_msgs)
+                                               procmsg_save_to_outbox
+                                                       (queue->folder->outbox,
+                                                        file, TRUE);
+                                        */
+                                       count++; 
+                                       folder_item_remove_msg(queue, msginfo->msgnum);
+                               }
+                               g_free(file);
                        }
-                       g_free(file);
                }
+               /* FIXME: supposedly if only one message is locked, and queue
+                * is being flushed, the following free says something like 
+                * "freeing msg ## in folder (nil)". */
                procmsg_msginfo_free(msginfo);
        }
 
-       return ret;
+       return ret * count;
 }
 
 gint procmsg_remove_special_headers(const gchar *in, const gchar *out)

diff --git a/src/toolbar.c b/src/toolbar.c
index 3ceedd27bba060d5021f5e8d3ff1ac30f6a9b166..1299b5ae1b9465dcac5df836c4ce40ba4b5030c3 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1984,10 +1984,12 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
                Folder *folder = list->data;
 
                if (folder->queue) {
-                       if (procmsg_send_queue
-                               (folder->queue, prefs_common.savemsg) < 0)
+                       gint res = procmsg_send_queue
+                               (folder->queue, prefs_common.savemsg);
+                       if (res < 0) 
                                alertpanel_error(_("Some errors occurred while sending queued messages."));
-                       folder_item_scan(folder->queue);
+                       if (res)
+                               folder_item_scan(folder->queue);
                }
        }
 }