inc_start(): Files were not moved from .processing to inbox
authorThorsten Maerz <torte@netztorte.de>
Thu, 14 Nov 2002 15:45:10 +0000 (15:45 +0000)
committerThorsten Maerz <torte@netztorte.de>
Thu, 14 Nov 2002 15:45:10 +0000 (15:45 +0000)
ChangeLog.claws
src/inc.c

index a4d3151..07f9124 100644 (file)
@@ -1,3 +1,9 @@
+2002-11-14 [thorsten]  0.8.5claws147
+
+       * src/inc.c
+               inc_start(): Files were not moved from .processing to inbox,
+               if no global processing rule existed
+
 2002-11-14 [colin]     0.8.5claws146
 
        * src/ssl_certificate
index 4a858dd..42d1d04 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -479,6 +479,9 @@ static gint inc_start(IncProgressDialog *inc_dialog)
        gint new_msgs = 0;
        gchar *msg;
        gchar *fin_msg;
+       FolderItem *processing, *inbox;
+       MsgInfo *msginfo;
+       GSList *msglist, *msglist_element;
 
        while (inc_dialog->queue_list != NULL) {
                session = inc_dialog->queue_list->data;
@@ -579,39 +582,33 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                statusbar_pop_all();
 
                /* CLAWS: perform filtering actions on dropped message */
-               if (global_processing != NULL) {
-                       FolderItem *processing, *inbox;
-                       MsgInfo *msginfo;
-                       GSList *msglist, *msglist_element;
-
-                       /* CLAWS: get default inbox (perhaps per account) */
-                       if (pop3_state->ac_prefs->inbox) {
-                               /* CLAWS: get destination folder / mailbox */
-                               inbox = folder_find_item_from_identifier(pop3_state->ac_prefs->inbox);
-                               if (!inbox)
-                                       inbox = folder_get_default_inbox();
-                       } else
+               /* CLAWS: get default inbox (perhaps per account) */
+               if (pop3_state->ac_prefs->inbox) {
+                       /* CLAWS: get destination folder / mailbox */
+                       inbox = folder_find_item_from_identifier(pop3_state->ac_prefs->inbox);
+                       if (!inbox)
                                inbox = folder_get_default_inbox();
+               } else
+                       inbox = folder_get_default_inbox();
 
-                       /* get list of messages in processing */
-                       processing = folder_get_default_processing();
-                       folder_item_scan(processing);
-                       msglist = folder_item_get_msg_list(processing);
-
-                       /* process messages */
-                       for(msglist_element = msglist; msglist_element != NULL; msglist_element = msglist_element->next) {
-                               msginfo = (MsgInfo *) msglist_element->data;
-                               /* filter if enabled in prefs or move to inbox if not */
-                               if(pop3_state->ac_prefs->filter_on_recv) {
-                                       filter_message_by_msginfo_with_inbox(global_processing, msginfo,
-                                                                            inbox);
-                               } else {
-                                       folder_item_move_msg(inbox, msginfo);
-                               }
-                               procmsg_msginfo_free(msginfo);
+               /* get list of messages in processing */
+               processing = folder_get_default_processing();
+               folder_item_scan(processing);
+               msglist = folder_item_get_msg_list(processing);
+
+               /* process messages */
+               for(msglist_element = msglist; msglist_element != NULL; msglist_element = msglist_element->next) {
+                       msginfo = (MsgInfo *) msglist_element->data;
+                       /* filter if enabled in prefs or move to inbox if not */
+                       if(global_processing && pop3_state->ac_prefs->filter_on_recv) {
+                               filter_message_by_msginfo_with_inbox(global_processing, msginfo,
+                                                                    inbox);
+                       } else {
+                               folder_item_move_msg(inbox, msginfo);
                        }
-                       g_slist_free(msglist);
+                       procmsg_msginfo_free(msginfo);
                }
+               g_slist_free(msglist);
 
 
                new_msgs += pop3_state->cur_total_num;