Remove the copy-paste that was folder[view]_fast_scan_tree, and

[claws.git] / src / folder.c

diff --git a/src/folder.c b/src/folder.c
index a248abcab28e7a38d11e79301644844781edecb5..6fa6d781ac10bc4c38647dfc6620eca8eec4c4c2 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -903,13 +903,23 @@ static gboolean folder_scan_tree_func(GNode *node, gpointer data)
 {
        GHashTable *pptable = (GHashTable *)data;
        FolderItem *item = (FolderItem *)node->data;
-       
+
        folder_item_restore_persist_prefs(item, pptable);
        folder_item_scan_full(item, FALSE);
 
        return FALSE;
 }
 
+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_scan_tree(Folder *folder, gboolean rebuild)
 {
        GHashTable *pptable;
@@ -936,44 +946,11 @@ void folder_scan_tree(Folder *folder, gboolean rebuild)
        hookdata.item = NULL;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 
-       g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);
-       folder_persist_prefs_free(pptable);
-
-       prefs_matcher_read_config();
-
-       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);
+       if (rebuild)
+               g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);
+       else
+               g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_restore_prefs_func, pptable);
 
-       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();