* src/mbox.c

[claws.git] / src / mbox.c

diff --git a/src/mbox.c b/src/mbox.c
index a1cc501a768509072183a4f1616a6ea2ea105504..59cae3b1f81d30b059cadd90356834c8fc62d9f1 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -52,22 +52,22 @@
                fclose(tmp_fp); \
                fclose(mbox_fp); \
                unlink(tmp_file); \
+               g_free(tmp_file); \
                return -1; \
        } \
 }
 
-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];
        gchar *tmp_file;
        gint msgs = 0;
-       FolderItem *inbox;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(mbox != NULL, -1);
 
-       debug_print(_("Getting messages from %s into %s...\n"), mbox, dest->path);
+       debug_print("Getting messages from %s into %s...\n", mbox, dest->path);
 
        if ((mbox_fp = fopen(mbox, "rb")) == NULL) {
                FILE_OP_ERROR(mbox, "fopen");
@@ -97,12 +97,10 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
        }
 
        tmp_file = get_tmp_file();
-       inbox    = folder_get_default_inbox();
 
        do {
                FILE *tmp_fp;
                FolderItem *dropfolder;
-               gchar *startp, *endp, *rpath;
                gint empty_line;
                gint val;
                gboolean is_next_msg = FALSE;
@@ -112,6 +110,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
                        FILE_OP_ERROR(tmp_file, "fopen");
                        g_warning(_("can't open temporary file\n"));
                        fclose(mbox_fp);
+                       g_free(tmp_file);
                        return -1;
                }
                if (change_file_mode_rw(tmp_fp, tmp_file) < 0)
@@ -200,51 +199,42 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
                        g_warning(_("can't write to temporary file\n"));
                        fclose(mbox_fp);
                        unlink(tmp_file);
+                       g_free(tmp_file);
                        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) {
                        fclose(mbox_fp);
                        unlink(tmp_file);
+                       g_free(tmp_file);
                        return -1;
                }
 
                if (global_processing) {
                        /* CLAWS: new filtering */
-                       if (folder_table) {
-                               filter_message(global_processing, inbox,
-                                              msgnum, folder_table);
-                       }
+                       filter_message(global_processing, dest,
+                                      msgnum);
                }
 
                msgs++;
        } while (from_line[0] != '\0');
 
+       g_free(tmp_file);
        fclose(mbox_fp);
-       debug_print(_("%d messages found.\n"), msgs);
+       debug_print("%d messages found.\n", msgs);
 
        return msgs;
 }
@@ -369,7 +359,7 @@ gint unlock_mbox(const gchar *base, gint fd, LockType type)
 
 gint copy_mbox(const gchar *src, const gchar *dest)
 {
-       return copy_file(src, dest);
+       return copy_file(src, dest, TRUE);
 }
 
 void empty_mbox(const gchar *mbox)
@@ -401,7 +391,7 @@ gint export_to_mbox(FolderItem *src, const gchar *mbox)
        g_return_val_if_fail(src->folder != NULL, -1);
        g_return_val_if_fail(mbox != NULL, -1);
 
-       debug_print(_("Exporting messages from %s into %s...\n"),
+       debug_print("Exporting messages from %s into %s...\n",
                    src->path, mbox);
 
        if ((mbox_fp = fopen(mbox, "wb")) == NULL) {