rever to filter from inbox approach

[claws.git] / src / mbox.c

diff --git a/src/mbox.c b/src/mbox.c
index a4b2f03c22b331b188cd84915b26f2bc4aa80160..e778c6f0e4a11898eac391476e95c174251db33c 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -224,17 +224,21 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
                } else
                        dropfolder = dest;
 
-               /* old filtering */
-               if (global_processing == NULL || folder_table == NULL) {
-                       if ((msgnum = folder_item_add_msg(dropfolder, tmp_file, TRUE)) < 0) {
-                               fclose(mbox_fp);
-                               unlink(tmp_file);
-                               return -1;
+                       
+               if ((msgnum = folder_item_add_msg(dropfolder, tmp_file, TRUE)) < 0) {
+                       fclose(mbox_fp);
+                       unlink(tmp_file);
+                       return -1;
+               }
+               folder_item_scan(dropfolder);
+
+               if (global_processing) {
+                       /* new filtering */
+                       if (folder_table) {
+                               filter_message(global_processing, dropfolder,
+                                              msgnum, folder_table);
                        }
-                       folder_item_scan(dropfolder);
                }
-               else    
-                       filter_incoming_message(dropfolder, tmp_file, folder_table);
 
                msgs++;
        } while (from_line[0] != '\0');