new filtering

[claws.git] / src / mbox.c

diff --git a/src/mbox.c b/src/mbox.c
index 6513beb6e719663d37619e9fe6b35961c90732ea..a5de8eff89315284cfd4a3d2d8bd644f78c4af95 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -41,6 +41,7 @@
 #include "prefs_account.h"
 #include "account.h"
 #include "utils.h"
+#include "filtering.h"
 
 #define MSGBUFSIZE     8192
 
@@ -103,6 +104,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
                gint empty_line;
                gint val;
                gboolean is_next_msg = FALSE;
+               gint msgnum;
 
                if ((tmp_fp = fopen(tmp_file, "w")) == NULL) {
                        FILE_OP_ERROR(tmp_file, "fopen");
@@ -198,26 +200,41 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
                }
 
                if (folder_table) {
-                       dropfolder = filter_get_dest_folder
-                               (prefs_common.fltlist, tmp_file);
-                       if (!dropfolder ||
-                           !strcmp(dropfolder->path, FILTER_NOT_RECEIVE))
+                       if (prefs_filtering == NULL) {
+                               /* old filtering */
+                               dropfolder = filter_get_dest_folder
+                                       (prefs_common.fltlist, tmp_file);
+                               if (!dropfolder ||
+                                   !strcmp(dropfolder->path, FILTER_NOT_RECEIVE))
+                                       dropfolder = dest;
+                               val = GPOINTER_TO_INT(g_hash_table_lookup
+                                                     (folder_table, dropfolder));
+                               if (val == 0) {
+                                       folder_item_scan(dropfolder);
+                                       g_hash_table_insert(folder_table, dropfolder,
+                                                           GINT_TO_POINTER(1));
+                               }
+                       }
+                       else {
+                               /* new filtering */
                                dropfolder = dest;
-                       val = GPOINTER_TO_INT(g_hash_table_lookup
-                                             (folder_table, dropfolder));
-                       if (val == 0) {
-                               folder_item_scan(dropfolder);
-                               g_hash_table_insert(folder_table, dropfolder,
-                                                   GINT_TO_POINTER(1));
                        }
                } else
                        dropfolder = dest;
 
-               if (folder_item_add_msg(dropfolder, tmp_file) < 0) {
+               if (msgnum =folder_item_add_msg(dropfolder, tmp_file) < 0) {
                        fclose(mbox_fp);
                        unlink(tmp_file);
                        return -1;
                }
+               
+               if (prefs_filtering != NULL) {
+                       /* new filtering */
+                       if (folder_table) {
+                               filter_message(prefs_filtering, dropfolder,
+                                              msgnum, folder_table);
+                       }
+               }
 
                msgs++;
        } while (from_line[0] != '\0');
@@ -394,7 +411,10 @@ gint export_to_mbox(FolderItem *src, const gchar *mbox)
                msginfo = (MsgInfo *)cur->data;
 
                msg_fp = procmsg_open_message(msginfo);
-               if (!msg_fp) continue;
+               if (!msg_fp) {
+                       procmsg_msginfo_free(msginfo);
+                       continue;
+               }
 
                strncpy2(buf,
                         msginfo->from ? msginfo->from :