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

instead fix folder_scan_tree to do the right thing when called
in "Check for new folders" mode: Don't rescan the contents of
all folders after having updated the list of folders. There's
"Check for new messages" for that.
Fixes bug #2119, "Check for new folders on remote mailboxes
is very slow".

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();

diff --git a/src/folder.h b/src/folder.h
index 191dcd8e7a45b551f00f9be1175bad1d0c9d6f9f..6ba032d4a15221d95762fd529654e0d073bb35fb 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -854,7 +854,6 @@ GList *folder_get_list              (void);
 gint   folder_read_list                (void);
 void   folder_write_list       (void);
 void   folder_scan_tree                (Folder *folder, gboolean rebuild);
-void   folder_fast_scan_tree   (Folder *folder);
 FolderItem *folder_create_folder(FolderItem    *parent, const gchar *name);
 gint   folder_item_rename      (FolderItem *item, gchar *newname);
 void   folder_update_op_count          (void);

diff --git a/src/folderview.c b/src/folderview.c
index abbc1dea48d04b5bc60cccd68fe3fc445e369534..42a0c86136c24f5ea0842858b8a2aa2b0f91a78f 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1086,47 +1086,6 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
        inc_unlock();
 }
 
-void folderview_fast_rescan_tree(Folder *folder)
-{
-       GtkWidget *window;
-       MainWindow *mainwin = mainwindow_get_mainwindow();
-       FolderView *folderview = NULL;
-       GtkAdjustment *pos = NULL;
-       gint height = 0;
-
-       cm_return_if_fail(folder != NULL);
-
-       if (!folder->klass->scan_tree) return;
-
-       inc_lock();
-
-       window = label_window_create(_("Scanning folder tree..."));
-
-       if (mainwin)
-               folderview = mainwin->folderview;
-       
-       if (folderview) {
-               pos = gtk_scrolled_window_get_vadjustment(
-                                       GTK_SCROLLED_WINDOW(folderview->scrolledwin));
-               height = gtk_adjustment_get_value(pos);
-       }
-
-       folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
-       folder_fast_scan_tree(folder);
-       folder_set_ui_func(folder, NULL, NULL);
-
-       folderview_set_all();
-
-       if (folderview) {
-               pos = gtk_scrolled_window_get_vadjustment(
-                                       GTK_SCROLLED_WINDOW(folderview->scrolledwin));
-               gtk_adjustment_set_value(pos, height);
-               gtk_adjustment_changed(pos);
-       }
-       label_window_destroy(window);
-       inc_unlock();
-}
-
 /** folderview_check_new()
  *  Scan and update the folder and return the 
  *  count the number of new messages since last check. 

diff --git a/src/folderview.h b/src/folderview.h
index aa6a4c3fa701e780c0ff1f1a1bd8e7fed4e8fa6c..c6f524ea40fc2eb2c4b52a1e3c43dec5db8b6753 100644 (file)
--- a/src/folderview.h
+++ b/src/folderview.h
@@ -121,7 +121,6 @@ FolderItem *folderview_get_selected_item(FolderView *folderview);
 
 void folderview_rescan_tree            (Folder         *folder,
                                         gboolean        rebuild);
-void folderview_fast_rescan_tree       (Folder         *folder);
 gint folderview_check_new              (Folder         *folder);
 void folderview_check_new_all          (void);
 

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index dae79e1a3870dbdeb10f4f5dc4723d8af983535c..dcda56e2660058f0a615de7382dbdb226f738234 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -552,7 +552,7 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
                        for (cur = transc_list; cur; cur = cur->next) 
                                g_free((gchar *)cur->data);
                        if (r == 0)
-                               folderview_fast_rescan_tree(item->folder);
+                               folderview_rescan_tree(item->folder, FALSE);
                } else {
                        alertpanel_notice(_("This folder is already subscribed and "
                                  "has no unsubscribed subfolders.\n\nIf there are new folders, "
@@ -596,7 +596,7 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
        }
 
        if (!action && item->folder->account->imap_subsonly)
-               folderview_fast_rescan_tree(item->folder);
+               folderview_rescan_tree(item->folder, FALSE);
 }
 
 static void subscribe_cb(GtkAction *action, gpointer data)
@@ -629,7 +629,7 @@ static void subscribed_cb(GtkAction *action, gpointer data)
        }
 
        item->folder->account->imap_subsonly = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-       folderview_fast_rescan_tree(item->folder);
+       folderview_rescan_tree(item->folder, FALSE);
 }
 
 static void download_cb(GtkAction *action, gpointer data)