merge new cache branch

[claws.git] / src / mbox.c

diff --git a/src/mbox.c b/src/mbox.c
index 56b5c0679b0462c63e6294f3709ccbe7b8496524..a1cc501a768509072183a4f1616a6ea2ea105504 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -214,7 +214,6 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
                                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));
                                }
@@ -232,7 +231,6 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, GHashTable *folder_table)
                        unlink(tmp_file);
                        return -1;
                }
-               folder_item_scan(dropfolder);
 
                if (global_processing) {
                        /* CLAWS: new filtering */
@@ -411,7 +409,7 @@ gint export_to_mbox(FolderItem *src, const gchar *mbox)
                return -1;
        }
 
-       mlist = src->folder->get_msg_list(src->folder, src, TRUE);
+       mlist = folder_item_get_msg_list(src);
 
        for (cur = mlist; cur != NULL; cur = cur->next) {
                msginfo = (MsgInfo *)cur->data;