reverse previous changes

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b9e4af9c909e9d1a1d1a4ba865095694c1234f0e..aea2e92a4f070002eca6c0cf1f6c7104a4dfb7c9 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -10,12 +10,7 @@
 
        clean up after sync with sylpheed 0.5.3 release
 
-       * src/account.c, src/mainwindow.c
-               replace folderview_update_all() with
-               folderview_update_all_node()
-
        * src/folderview.c
-               remove folderview_update_all()
                fix re-introduced font mess, see Christoph's
                entry 2001-06-24
 

diff --git a/src/account.c b/src/account.c
index 0dc2913c874768962c138487736ebfccaed6084e..94bf40ec34e0acd54b539ee14f9e5fcf518bebf3 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -568,7 +568,7 @@ static void account_edit_prefs(void)
            ac_prefs->folder && strcmp(ac_name, ac_prefs->account_name) != 0) {
                folder_set_name(FOLDER(ac_prefs->folder),
                                ac_prefs->account_name);
-               folderview_update_all_node();
+               folderview_update_all();
        }
 
        account_clist_set();
@@ -591,7 +591,7 @@ static void account_delete(void)
        ac_prefs = gtk_clist_get_row_data(clist, row);
        if (ac_prefs->folder) {
                folder_destroy(FOLDER(ac_prefs->folder));
-               folderview_update_all_node();
+               folderview_update_all();
        }
        account_destroy(ac_prefs);
        account_clist_set();

diff --git a/src/folderview.c b/src/folderview.c
index 6e82c9c44939b7c05fa1a34acbbf8c1a3bdcb789..d27cb30155fa6770666556c1ec04c9c12ed37f76 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -674,6 +674,29 @@ void folderview_update_tree(Folder *folder)
        gtk_widget_destroy(window);
 }
 
+void folderview_update_all(void)
+{
+       GList *list;
+       GtkWidget *window;
+
+       window = label_window_create(_("Updating all folders..."));
+
+       list = folder_get_list();
+       for (; list != NULL; list = list->next) {
+               Folder *folder = list->data;
+
+               if (!folder->scan_tree) continue;
+               folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
+               folder->scan_tree(folder);
+               folder_set_ui_func(folder, NULL, NULL);
+       }
+
+       folder_write_list();
+       folderview_set_all();
+
+       gtk_widget_destroy(window);
+}
+
 void folderview_update_all_node(void)
 {
        GList *list;

diff --git a/src/mainwindow.c b/src/mainwindow.c
index ae39c01930ead353a4572ec43b812bffcce576ed..0d9c9663df5715628f75ee3481e6faff29425c0c 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1937,7 +1937,7 @@ static void update_folderview_cb(MainWindow *mainwin, guint action,
                                 GtkWidget *widget)
 {
        summary_show(mainwin->summaryview, NULL, FALSE);
-       folderview_update_all_node();
+       folderview_update_all();
 }
 
 static void new_folder_cb(MainWindow *mainwin, guint action,