2007-03-24 [paul] 2.8.1cvs47

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index 2ecc795889df14bd413a46a0b4cea66e76630cd2..c74dc773f5dc4082c14825fa27a092776e5a9e7b 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -620,6 +620,7 @@ FolderView *folderview_create(void)
        
        folderview->target_list = gtk_target_list_new(folderview_drag_types, 2);
        folderview_list = g_list_append(folderview_list, folderview);
+       folderview->deferred_refresh_id = -1;
 
        return folderview;
 }
@@ -706,6 +707,23 @@ void folderview_init(FolderView *folderview)
        }
 }
 
+static gboolean folderview_defer_set(gpointer data)
+{
+       FolderView *folderview = (FolderView *)data;
+       MainWindow *mainwin = folderview->mainwin;
+       
+       if (!mainwin)
+               return FALSE;
+       if (mainwin->lock_count)
+               return TRUE;
+               
+       printf("doing deferred folderview_set now\n");
+       folderview_set(folderview);
+
+       folderview->deferred_refresh_id = -1;
+       return FALSE;
+}
+
 void folderview_set(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -715,6 +733,15 @@ void folderview_set(FolderView *folderview)
        if (!mainwin)
                return;
 
+       if (mainwin->lock_count) {
+               if (folderview->deferred_refresh_id == -1)
+                       folderview->deferred_refresh_id = 
+                               g_timeout_add(500, folderview_defer_set, folderview);
+               printf("deferred folderview_set\n");
+               return;
+       }
+
+       inc_lock();
        debug_print("Setting folder info...\n");
        STATUSBAR_PUSH(mainwin, _("Setting folder info..."));
 
@@ -741,6 +768,7 @@ void folderview_set(FolderView *folderview)
        gtk_clist_thaw(GTK_CLIST(ctree));
        main_window_cursor_normal(mainwin);
        STATUSBAR_POP(mainwin);
+       inc_unlock();
 }
 
 void folderview_set_all(void)
@@ -1169,7 +1197,7 @@ gint folderview_check_new(Folder *folder)
                                        if (folder) {
                                                summaryview_unlock(folderview->summaryview, item);
                                                if (FOLDER_TYPE(item->folder) == F_NEWS || FOLDER_IS_LOCAL(folder)) {
-                                                       log_error(_("Couldn't scan folder %s\n"),
+                                                       log_error(LOG_PROTOCOL, _("Couldn't scan folder %s\n"),
                                                                item->path ? item->path:item->name);
                                                        continue;
                                                } else if (!FOLDER_IS_LOCAL(folder)) {
@@ -2014,6 +2042,28 @@ static gboolean postpone_select(void *data)
        return FALSE;
 }
 
+void folderview_close_opened(FolderView *folderview)
+{
+       if (folderview->opened) {
+               FolderItem *olditem;
+               
+               olditem = gtk_ctree_node_get_row_data(folderview->ctree, folderview->opened);
+               if (olditem) {
+                       gchar *buf = g_strdup_printf(_("Closing Folder %s..."), 
+                               olditem->path ? olditem->path:olditem->name);
+                       /* will be null if we just moved the previously opened folder */
+                       STATUSBAR_PUSH(folderview->mainwin, buf);
+                       main_window_cursor_wait(folderview->mainwin);
+                       g_free(buf);
+                       summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
+                       summary_show(folderview->summaryview, NULL);
+                       folder_item_close(olditem);
+                       main_window_cursor_normal(folderview->mainwin);
+                       STATUSBAR_POP(folderview->mainwin);
+               }
+       }
+       folderview->opened = NULL;
+}
 static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                                gint column, FolderView *folderview)
 {
@@ -2058,24 +2108,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        /* Save cache for old folder */
        /* We don't want to lose all caches if sylpheed crashed */
-       if (folderview->opened) {
-               FolderItem *olditem;
-               
-               olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
-               if (olditem) {
-                       buf = g_strdup_printf(_("Closing Folder %s..."), 
-                               olditem->path ? olditem->path:olditem->name);
-                       /* will be null if we just moved the previously opened folder */
-                       STATUSBAR_PUSH(folderview->mainwin, buf);
-                       main_window_cursor_wait(folderview->mainwin);
-                       g_free(buf);
-                       summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
-                       summary_show(folderview->summaryview, NULL);
-                       folder_item_close(olditem);
-                       main_window_cursor_normal(folderview->mainwin);
-                       STATUSBAR_POP(folderview->mainwin);
-               }
-       }
+       folderview_close_opened(folderview);
 
        /* CLAWS: set compose button type: news folder items 
         * always have a news folder as parent */
@@ -2466,7 +2499,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
                                                _("Can't move a folder to one of its children."));
                        break;
                case F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX:
-                       alertpanel_error(_("Folder moving cannot be done between different mailboxes."));
+                       alertpanel_error(_("A folder cannot be moved between different mailboxes."));
                        break;
                default:
                        alertpanel_error(copy ? _("Copy failed!"):_("Move failed!"));