* config/.cvsignore

[claws.git] / src / mbox.c

diff --git a/src/mbox.c b/src/mbox.c
index f99980631c3215387e94ed2be130e6575953f844..eb8015db4db2a129cb7c80359804bef56eebd856 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -57,7 +57,7 @@
        } \
 }
 
-gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
+gint proc_mbox(FolderItem *dest, const gchar *mbox)
 {
        FILE *mbox_fp;
        gchar buf[MSGBUFSIZE], from_line[MSGBUFSIZE];
@@ -205,27 +205,17 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
                        return -1;
                }
 
-               if (folder_table) {
-                       if (global_processing == 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) {
-                                       g_hash_table_insert(folder_table, dropfolder,
-                                                           GINT_TO_POINTER(1));
-                               }
-                       }
-                       else {
-                               /* CLAWS: new filtering */
-                               dropfolder = folder_get_default_processing();
-                       }
-               } else
-                       dropfolder = dest;
+               if (global_processing == NULL) {
+                       /* old filtering */
+                       dropfolder = filter_get_dest_folder
+                               (prefs_common.fltlist, tmp_file);
+                       if (!dropfolder ||
+                           !strcmp(dropfolder->path, FILTER_NOT_RECEIVE))
+                               dropfolder = dest;
+               } else {
+                       /* CLAWS: new filtering */
+                       dropfolder = folder_get_default_processing();
+               }
 
                        
                if ((msgnum = folder_item_add_msg(dropfolder, tmp_file, TRUE)) < 0) {
@@ -237,10 +227,8 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
 
                if (global_processing) {
                        /* CLAWS: new filtering */
-                       if (folder_table) {
-                               filter_message(global_processing, inbox,
-                                              msgnum, folder_table);
-                       }
+                       filter_message(global_processing, inbox,
+                                      msgnum);
                }
 
                msgs++;