2007-05-02 [paul] 2.9.1cvs36
[claws.git] / src / folder.c
index ac0dc906e9b89d50e544ce2f92ec7890a9b34d36..b2a17dc22256c13d1a6703dfcbd2cf03d3963542 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,6 +81,8 @@ static GSList *folder_unloaded_list = NULL;
 void folder_init               (Folder         *folder,
                                 const gchar    *name);
 
+static gchar *folder_item_get_cache_file       (FolderItem     *item);
+static gchar *folder_item_get_mark_file        (FolderItem     *item);
 static gchar *folder_get_list_path     (void);
 static GNode *folder_get_xml_node      (Folder         *folder);
 static Folder *folder_get_from_xml     (GNode          *node);
@@ -90,10 +92,13 @@ static void folder_update_op_count_rec      (GNode          *node);
 static void folder_get_persist_prefs_recursive
                                        (GNode *node, GHashTable *pptable);
 static gboolean persist_prefs_free     (gpointer key, gpointer val, gpointer data);
-void folder_item_read_cache            (FolderItem *item);
+static void folder_item_read_cache             (FolderItem *item);
 gint folder_item_scan_full             (FolderItem *item, gboolean filtering);
 static void folder_item_update_with_msg (FolderItem *item, FolderItemUpdateFlags update_flags,
                                          MsgInfo *msg);
+static GHashTable *folder_persist_prefs_new    (Folder *folder);
+static void folder_persist_prefs_free          (GHashTable *pptable);
+static void folder_item_restore_persist_prefs  (FolderItem *item, GHashTable *pptable);
 
 void folder_system_init(void)
 {
@@ -102,7 +107,7 @@ void folder_system_init(void)
        folder_register_class(news_get_class());
 }
 
-GSList *folder_get_class_list(void)
+static GSList *folder_get_class_list(void)
 {
        return class_list;
 }
@@ -341,6 +346,7 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->unreadmarked_msgs = 0;
        item->marked_msgs = 0;
        item->total_msgs = 0;
+       item->order = 0;
        item->last_num = -1;
        item->cache = NULL;
        item->no_sub = FALSE;
@@ -522,6 +528,8 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                        item->unreadmarked_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "marked"))
                        item->marked_msgs = atoi(attr->value);
+               else if (!strcmp(attr->name, "order"))
+                       item->order = atoi(attr->value);
                else if (!strcmp(attr->name, "total"))
                        item->total_msgs = atoi(attr->value);
                else if (!strcmp(attr->name, "no_sub"))
@@ -625,6 +633,7 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
        xml_tag_add_attr(tag, xml_attr_new_int("unreadmarked", item->unreadmarked_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("marked", item->marked_msgs));
        xml_tag_add_attr(tag, xml_attr_new_int("total", item->total_msgs));
+       xml_tag_add_attr(tag, xml_attr_new_int("order", item->order));
 
        if (item->account)
                xml_tag_add_attr(tag, xml_attr_new_int("account_id", item->account->account_id));
@@ -667,7 +676,7 @@ void folder_set_sort(Folder *folder, guint sort)
        }
 }
 
-gboolean folder_tree_destroy_func(GNode *node, gpointer data) {
+static gboolean folder_tree_destroy_func(GNode *node, gpointer data) {
        FolderItem *item = (FolderItem *) node->data;
 
        folder_item_destroy(item);
@@ -786,7 +795,11 @@ void folder_write_list(void)
        path = folder_get_list_path();
        if ((pfile = prefs_write_open(path)) == NULL) return;
 
-       xml_file_put_xml_decl(pfile->fp);
+       if (xml_file_put_xml_decl(pfile->fp) < 0) {
+               prefs_file_close_revert(pfile);
+               g_warning("failed to start write folder list.\n");
+               return;         
+       }
        tag = xml_tag_new("folderlist");
 
        xmlnode = xml_node_new(tag, NULL);
@@ -808,15 +821,16 @@ void folder_write_list(void)
                g_node_append(rootnode, (gpointer) xml_copy_tree(node));
        }
 
-       xml_write_tree(rootnode, pfile->fp);
-
-       if (prefs_file_close(pfile) < 0)
+       if (xml_write_tree(rootnode, pfile->fp) < 0) {
+               prefs_file_close_revert(pfile);
                g_warning("failed to write folder list.\n");
-
+       } else if (prefs_file_close(pfile) < 0) {
+               g_warning("failed to write folder list.\n");
+       }
        xml_free_tree(rootnode);
 }
 
-gboolean folder_scan_tree_func(GNode *node, gpointer data)
+static gboolean folder_scan_tree_func(GNode *node, gpointer data)
 {
        GHashTable *pptable = (GHashTable *)data;
        FolderItem *item = (FolderItem *)node->data;
@@ -861,6 +875,43 @@ void folder_scan_tree(Folder *folder, gboolean rebuild)
        folder_write_list();
 }
 
+static gboolean folder_restore_prefs_func(GNode *node, gpointer data)
+{
+       GHashTable *pptable = (GHashTable *)data;
+       FolderItem *item = (FolderItem *)node->data;
+       
+       folder_item_restore_persist_prefs(item, pptable);
+
+       return FALSE;
+}
+
+void folder_fast_scan_tree(Folder *folder)
+{
+       GHashTable *pptable;
+       FolderUpdateData hookdata;
+
+       if (!folder->klass->scan_tree)
+               return;
+       
+       pptable = folder_persist_prefs_new(folder);
+
+       if (folder->klass->scan_tree(folder) < 0) {
+               return;
+       } 
+
+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_TREE_CHANGED;
+       hookdata.item = NULL;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+
+       g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_restore_prefs_func, pptable);
+       folder_persist_prefs_free(pptable);
+
+       prefs_matcher_read_config();
+
+       folder_write_list();
+}
+
 FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
 {
        FolderItem *new_item;
@@ -1142,14 +1193,20 @@ FolderItem *folder_find_item_from_path(const gchar *path)
 {
        Folder *folder;
        gpointer d[2];
-
-       folder = folder_get_default_folder();
+       GList *list = folder_get_list();
+       
+       folder = list ? list->data:NULL;
+       
        g_return_val_if_fail(folder != NULL, NULL);
 
        d[0] = (gpointer)path;
        d[1] = NULL;
-       g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+       while (d[1] == NULL && list) {
+               folder = FOLDER(list->data);
+               g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
                        folder_item_find_func, d);
+               list = list->next;
+       }
        return d[1];
 }
 
@@ -1186,7 +1243,7 @@ FolderClass *folder_get_class_from_string(const gchar *str)
        return NULL;
 }
 
-gchar *folder_get_identifier(Folder *folder)
+static gchar *folder_get_identifier(Folder *folder)
 {
        gchar *type_str;
 
@@ -1321,11 +1378,6 @@ gchar *folder_item_get_name(FolderItem *item)
        return name;
 }
 
-Folder *folder_get_default_folder(void)
-{
-       return folder_list ? FOLDER(folder_list->data) : NULL;
-}
-
 gboolean folder_have_mailbox (void)
 {
        GList *cur;
@@ -1357,6 +1409,26 @@ FolderItem *folder_get_default_inbox(void)
        return NULL;
 }
 
+FolderItem *folder_get_default_inbox_for_class(FolderType type)
+{
+       GList *flist;
+
+       for (flist = folder_list; flist != NULL; flist = g_list_next(flist)) {
+               Folder * folder = FOLDER(flist->data);
+
+               if (folder == NULL)
+                       continue;
+               if (folder->inbox == NULL)
+                       continue;
+               if (folder->klass->type != type)
+                       continue;
+
+               return folder->inbox;
+       }
+
+       return NULL;
+}
+
 FolderItem *folder_get_default_outbox(void)
 {
        GList *flist;
@@ -1707,6 +1779,7 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
                MsgPermFlags permflags = 0;
                gboolean skip;
 
+               folder_item_update_freeze();
                for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
                        msginfo = (MsgInfo *) cur->data;
                
@@ -1724,6 +1797,7 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
                                        ~permflags & msginfo->flags.perm_flags, 0);
                        }
                }
+               folder_item_update_thaw();
        }
        folder_item_set_batch(item, FALSE);
        g_relation_destroy(relation);   
@@ -1981,7 +2055,12 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                                }
                                g_slist_free(unfiltered);
                        }
-               } 
+                       if (prefs_common.real_time_sync)
+                               folder_item_synchronise(item);
+               } else {
+                       if (prefs_common.real_time_sync)
+                               folder_item_synchronise(item);
+               }
 
                g_slist_free(newmsg_list);
 
@@ -2060,21 +2139,6 @@ gint folder_item_scan(FolderItem *item)
        return folder_item_scan_full(item, TRUE);
 }
 
-static gboolean folder_scan_all_items_func(GNode *node, gpointer data)
-{
-       FolderItem *item = node->data;
-
-       folder_item_scan(item);
-
-       return FALSE;
-}
-
-void folder_scan_all_items(Folder * folder)
-{
-       g_node_traverse(folder->node, G_PRE_ORDER,
-                       G_TRAVERSE_ALL, -1, folder_scan_all_items_func, NULL);
-}
-
 static void folder_item_scan_foreach_func(gpointer key, gpointer val,
                                          gpointer data)
 {
@@ -2086,7 +2150,7 @@ void folder_item_scan_foreach(GHashTable *table)
        g_hash_table_foreach(table, folder_item_scan_foreach_func, NULL);
 }
 
-void folder_count_total_cache_memusage(FolderItem *item, gpointer data)
+static void folder_count_total_cache_memusage(FolderItem *item, gpointer data)
 {
        gint *memusage = (gint *)data;
 
@@ -2127,7 +2191,7 @@ gint folder_item_syncronize_flags(FolderItem *item)
        return ret;
 }
 
-gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
+static gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
 {
        FolderItem *fa = (FolderItem *)a;
        FolderItem *fb = (FolderItem *)b;
@@ -2135,7 +2199,7 @@ gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
        return (gint) (msgcache_get_last_access_time(fa->cache) - msgcache_get_last_access_time(fb->cache));
 }
 
-void folder_find_expired_caches(FolderItem *item, gpointer data)
+static void folder_find_expired_caches(FolderItem *item, gpointer data)
 {
        GSList **folder_item_list = (GSList **)data;
        gint difftime, expiretime;
@@ -2217,7 +2281,7 @@ void folder_clean_cache_memory(FolderItem *protected_item)
        }
 }
 
-void folder_item_read_cache(FolderItem *item)
+static void folder_item_read_cache(FolderItem *item)
 {
        gchar *cache_file, *mark_file;
        START_TIMING("");
@@ -2370,7 +2434,7 @@ GSList *folder_item_get_msg_list(FolderItem *item)
        return msgcache_get_msg_list(item->cache);
 }
 
-void msginfo_set_mime_flags(GNode *node, gpointer data)
+static void msginfo_set_mime_flags(GNode *node, gpointer data)
 {
        MsgInfo *msginfo = data;
        MimeInfo *mimeinfo = node->data;
@@ -2463,7 +2527,11 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
        if (folder->klass->fetch_msg_full == NULL)
                return folder_item_fetch_msg(item, num);
 
-       msgfile = folder->klass->fetch_msg_full(folder, item, num, 
+       if (item->prefs->offlinesync && prefs_common.real_time_sync)
+               msgfile = folder->klass->fetch_msg_full(folder, item, num, 
+                                               TRUE, TRUE);
+       else
+               msgfile = folder->klass->fetch_msg_full(folder, item, num, 
                                                headers, body);
 
        if (msgfile != NULL) {
@@ -2528,6 +2596,8 @@ gint folder_item_fetch_all_msg(FolderItem *item)
                                        folder->ui_func_data ?
                                        folder->ui_func_data :
                                        GINT_TO_POINTER(num));
+               if (num % 50 == 0)
+                       GTK_EVENTS_FLUSH();
 
                msg = folder_item_fetch_msg(item, msginfo->msgnum);
                if (!msg) {
@@ -2773,8 +2843,8 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
 
         return lastnum;
 }
-               
-FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest
+
+static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest, gboolean copy
 {
        GSList *mlist;
        FolderItem *new_item;
@@ -2783,7 +2853,7 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
        gchar *old_id, *new_id;
 
        /* move messages */
-       debug_print("Moving %s to %s\n", src->path, dest->path);
+       debug_print("%s %s to %s\n", copy?"Copying":"Moving", src->path, dest->path);
        new_item = folder_create_folder(dest, src->name);
        if (new_item == NULL) {
                printf("Can't create folder\n");
@@ -2794,18 +2864,27 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
                new_item->folder = dest->folder;
 
        /* move messages */
-       log_message(_("Moving %s to %s...\n"), 
+       log_message(LOG_PROTOCOL, copy ?_("Copying %s to %s...\n"):_("Moving %s to %s...\n"), 
                        src->name, new_item->path);
 
        mlist = folder_item_get_msg_list(src);
        
        if (mlist != NULL) {
-               folder_item_move_msgs(new_item, mlist);
+               if (copy)
+                       folder_item_copy_msgs(new_item, mlist);
+               else
+                       folder_item_move_msgs(new_item, mlist);
                procmsg_msg_list_free(mlist);
        }
        
        /*copy prefs*/
        folder_item_prefs_copy_prefs(src, new_item);
+       
+       /* copy internal data */
+       if (src->folder->klass == new_item->folder->klass &&
+           src->folder->klass->copy_private_data != NULL)
+               src->folder->klass->copy_private_data(src->folder,
+                                       src, new_item);
        new_item->collapsed = src->collapsed;
        new_item->thread_collapsed = src->thread_collapsed;
        new_item->threaded  = src->threaded;
@@ -2824,23 +2903,25 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
                if (srcnode && srcnode->data) {
                        next_item = (FolderItem*) srcnode->data;
                        srcnode = srcnode->next;
-                       if (folder_item_move_recursive(next_item, new_item) == NULL) {
+                       if (folder_item_move_recursive(next_item, new_item, copy) == NULL) {
                                return NULL;
                        }
                }
        }
        old_id = folder_item_get_identifier(src);
        new_id = folder_item_get_identifier(new_item);
-       debug_print("updating rules : %s => %s\n", old_id, new_id);
 
        /* if src supports removing, otherwise only copy folder */
-       if (src->folder->klass->remove_folder != NULL 
+       if (src->folder->klass->remove_folder != NULL && !copy) 
                src->folder->klass->remove_folder(src->folder, src);
        folder_write_list();
 
-       if (old_id != NULL && new_id != NULL) {
-               prefs_filtering_rename_path(old_id, new_id);
-               account_rename_path(old_id, new_id);
+       if (!copy) {
+               debug_print("updating rules : %s => %s\n", old_id, new_id);
+               if (old_id != NULL && new_id != NULL) {
+                       prefs_filtering_rename_path(old_id, new_id);
+                       account_rename_path(old_id, new_id);
+               }
        }
        g_free(old_id);
        g_free(new_id);
@@ -2848,12 +2929,12 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
        return new_item;
 }
 
-gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_item)
+gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_item, gboolean copy)
 {
        FolderItem *tmp = folder_item_parent(dest);
        gchar * src_identifier, * dst_identifier;
        gchar * phys_srcpath, * phys_dstpath, *tmppath;
-       
+
        while (tmp) {
                if (tmp == src) {
                        return F_MOVE_FAILED_DEST_IS_CHILD;
@@ -2875,7 +2956,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                return F_MOVE_FAILED;
        }
 
-       if (src->folder != dest->folder) {
+       if (src->folder != dest->folder && !copy) {
                return F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX;
        }
 
@@ -2895,7 +2976,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                return F_MOVE_FAILED_DEST_IS_PARENT;
        }
        debug_print("moving \"%s\" to \"%s\"\n", phys_srcpath, phys_dstpath);
-       if ((tmp = folder_item_move_recursive(src, dest)) == NULL) {
+       if ((tmp = folder_item_move_recursive(src, dest, copy)) == NULL) {
                return F_MOVE_FAILED;
        }
        
@@ -3035,8 +3116,15 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                        item = msginfo->folder;
 
                        tuples = g_relation_select(relation, msginfo, 0);
-                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                       g_tuples_destroy(tuples);
+                       if (tuples) {
+                               if (tuples->len)
+                                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+                               else
+                                       num = 0;
+                               g_tuples_destroy(tuples);
+                       } else {
+                               num = -1;
+                       }
 
                        if (g_slist_find(not_moved, msginfo))
                                continue;
@@ -3070,9 +3158,14 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                 GTuples *tuples;
 
                 tuples = g_relation_select(relation, msginfo, 0);
-                num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                g_tuples_destroy(tuples);
-
+               if (tuples->len > 0) {
+                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+                       g_tuples_destroy(tuples);
+               } else {
+                       num = 0;
+                       if (tuples)
+                               g_tuples_destroy(tuples);
+               }
                statusbar_progress_all(curmsg++,total, 100);
                if (curmsg % 100 == 0)
                        GTK_EVENTS_FLUSH();
@@ -3080,7 +3173,17 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                if (num >= 0) {
                        MsgInfo *newmsginfo = NULL;
 
-                       if (folderscan) {
+                       if (!folderscan && num > 0) {
+                               newmsginfo = get_msginfo(dest, num);
+                               if (newmsginfo != NULL) {
+                                       add_msginfo_to_cache(dest, newmsginfo, msginfo);
+                               }
+                       }
+                       if (newmsginfo == NULL) {
+                               if (!folderscan) {
+                                       folder_item_scan_full(dest, FALSE);
+                                       folderscan = TRUE;
+                               }
                                if (msginfo->msgid != NULL) {
                                        newmsginfo = folder_item_get_msginfo_by_msgid(dest, msginfo->msgid);
                                        if (newmsginfo != NULL) {
@@ -3088,11 +3191,6 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                                num = newmsginfo->msgnum;
                                        }
                                }
-                       } else {
-                               newmsginfo = get_msginfo(dest, num);
-                               if (newmsginfo != NULL) {
-                                       add_msginfo_to_cache(dest, newmsginfo, msginfo);
-                               }
                        }
 
                        if (msginfo->planned_download 
@@ -3332,10 +3430,11 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
        return folder->klass->is_msg_changed(folder, item, msginfo);
 }
 
-gchar *folder_item_get_cache_file(FolderItem *item)
+static gchar *folder_item_get_cache_file(FolderItem *item)
 {
        gchar *path;
        gchar *file;
+       gchar *old_file;
 
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(item->path != NULL, NULL);
@@ -3345,15 +3444,21 @@ gchar *folder_item_get_cache_file(FolderItem *item)
        if (!is_dir_exist(path))
                make_dir_hier(path);
        file = g_strconcat(path, G_DIR_SEPARATOR_S, CACHE_FILE, NULL);
+       old_file = g_strconcat(path, G_DIR_SEPARATOR_S, OLD_CACHE_FILE, NULL);
+
+       if (!is_file_exist(file) && is_file_exist(old_file))
+               move_file(old_file, file, FALSE);
+       g_free(old_file);
        g_free(path);
 
        return file;
 }
 
-gchar *folder_item_get_mark_file(FolderItem *item)
+static gchar *folder_item_get_mark_file(FolderItem *item)
 {
        gchar *path;
        gchar *file;
+       gchar *old_file;
 
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(item->path != NULL, NULL);
@@ -3363,6 +3468,11 @@ gchar *folder_item_get_mark_file(FolderItem *item)
        if (!is_dir_exist(path))
                make_dir_hier(path);
        file = g_strconcat(path, G_DIR_SEPARATOR_S, MARK_FILE, NULL);
+       old_file = g_strconcat(path, G_DIR_SEPARATOR_S, OLD_MARK_FILE, NULL);
+
+       if (!is_file_exist(file) && is_file_exist(old_file))
+               move_file(old_file, file, FALSE);
+       g_free(old_file);
        g_free(path);
 
        return file;
@@ -3656,7 +3766,7 @@ FolderItem *folder_get_default_processing(void)
  * (note that in claws other options are in the folder_item_prefs_RC
  * file, so those don't need to be included in PersistPref yet) 
  */
-GHashTable *folder_persist_prefs_new(Folder *folder)
+static GHashTable *folder_persist_prefs_new(Folder *folder)
 {
        GHashTable *pptable;
 
@@ -3666,20 +3776,20 @@ GHashTable *folder_persist_prefs_new(Folder *folder)
        return pptable;
 }
 
-void folder_persist_prefs_free(GHashTable *pptable)
+static void folder_persist_prefs_free(GHashTable *pptable)
 {
        g_return_if_fail(pptable);
        g_hash_table_foreach_remove(pptable, persist_prefs_free, NULL);
        g_hash_table_destroy(pptable);
 }
 
-const PersistPrefs *folder_get_persist_prefs(GHashTable *pptable, const char *name)
+static const PersistPrefs *folder_get_persist_prefs(GHashTable *pptable, const char *name)
 {
        if (pptable == NULL || name == NULL) return NULL;
        return g_hash_table_lookup(pptable, name);
 }
 
-void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
+static void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
 {
        const PersistPrefs *pp;
        gchar *id = folder_item_get_identifier(item);
@@ -3786,14 +3896,16 @@ void folder_item_apply_processing(FolderItem *item)
                statusbar_progress_all(curmsg++,total, 10);
 
                 /* apply pre global rules */
-               filter_message_by_msginfo(pre_global_processing, msginfo, NULL);
+               filter_message_by_msginfo(pre_global_processing, msginfo, NULL,
+                               FILTERING_PRE_PROCESSING, NULL);
                
                 /* apply rules of the folder */
-               filter_message_by_msginfo(processing_list, msginfo, NULL);
+               filter_message_by_msginfo(processing_list, msginfo, NULL,
+                               FILTERING_FOLDER_PROCESSING, item->name);
 
                 /* apply post global rules */
-               filter_message_by_msginfo(post_global_processing, msginfo, NULL);
-                
+               filter_message_by_msginfo(post_global_processing, msginfo, NULL,
+                               FILTERING_POST_PROCESSING, NULL);
        }
        prefs_common.apply_per_account_filtering_rules = last_apply_per_account;
 
@@ -3891,12 +4003,22 @@ void folder_item_update_thaw(void)
        }
 }
 
+void folder_item_synchronise(FolderItem *item)
+{
+       if (!item)
+               return;
+       if (item->prefs->offlinesync && item->folder->klass->synchronise) {
+               statusbar_print_all(_("Synchronising %s for offline use...\n"), item->path ? item->path : "(null)");
+               item->folder->klass->synchronise(item);
+               statusbar_pop_all();
+       }
+}
+
 static void folder_item_synchronise_func(FolderItem *item, gpointer data)
 {
        Folder *folder = (Folder *)data;
        if (folder == NULL || item->folder == folder) {
-               if(item->prefs->offlinesync && item->folder->klass->synchronise)
-                       item->folder->klass->synchronise(item);
+               folder_item_synchronise(item);
        }
 }
 
@@ -3930,7 +4052,8 @@ gboolean folder_want_synchronise(Folder *folder)
        folder_func_to_all_folders(folder_item_want_synchronise_func, want_sync_data);
        result = want_sync_data->want_sync;
        g_free(want_sync_data);
-       debug_print("Folder %s wants sync: %d\n", folder->name, result);
+       if (result > 0)
+               debug_print("Folder %s wants sync\n", folder->name);
        return result;
 }