* src/folder.c

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index b62bed25db642039b3588449afe6b8995c288a5a..2797094e3957b17157d3f29f3e3165782c22ad4b 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -260,7 +260,7 @@ static void folderview_drag_data_get     (GtkWidget        *widget,
 
 void folderview_create_folder_node       (FolderView       *folderview, 
                                          FolderItem       *item);
-void folderview_update_item             (gpointer          source,
+gboolean folderview_update_item                 (gpointer          source,
                                          gpointer          data);
 
 static void folderview_scoring_cb(FolderView *folderview, guint action,
@@ -506,7 +506,7 @@ FolderView *folderview_create(void)
        folderview->mbox_factory = mbox_factory;
 
        folderview->folder_item_update_callback_id =
-               hooks_register_hook("folder_item_update", folderview_update_item, (gpointer) folderview);
+               hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
 
        gtk_widget_show_all(scrolledwin);
 
@@ -1261,16 +1261,16 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                folderview_update_node(folderview, node);
 }
 
-void folderview_update_item(gpointer source, gpointer data)
+gboolean folderview_update_item(gpointer source, gpointer data)
 {
        FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
        FolderView *folderview = (FolderView *)data;
        GtkCTree *ctree;
        GtkCTreeNode *node;
 
-       g_return_if_fail(update_info != NULL);
-       g_return_if_fail(update_info->item != NULL);
-       g_return_if_fail(folderview != NULL);
+       g_return_val_if_fail(update_info != NULL, TRUE);
+       g_return_val_if_fail(update_info->item != NULL, TRUE);
+       g_return_val_if_fail(folderview != NULL, FALSE);
 
        ctree = GTK_CTREE(folderview->ctree);
 
@@ -1280,6 +1280,8 @@ void folderview_update_item(gpointer source, gpointer data)
                if (update_info->content_change && folderview->opened == node)
                        summary_show(folderview->summaryview, update_info->item);
        }
+       
+       return FALSE;
 }
 
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
@@ -2582,7 +2584,9 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
        gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), FALSE);
        inc_lock();
        main_window_cursor_wait(folderview->mainwin);
+       statusbar_verbosity_set(TRUE);
        if ((status = folder_item_move_to(from_folder, to_folder, &new_folder)) == F_MOVE_OK) {
+               statusbar_verbosity_set(FALSE);
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
                if (src_node)
@@ -2598,6 +2602,7 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
                                NULL, new_folder->parent), new_folder->folder);
                folderview_select(folderview, new_folder);
        } else {
+               statusbar_verbosity_set(FALSE);         
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
                switch (status) {