* src/folderview.c

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index 2bb1c38ca8b9d0fa9ab16b8e106773f733df37b4..dc1d1bb774451d89e678277666520164fce54f50 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1293,6 +1293,16 @@ static void folderview_expand_func(GtkCTree *ctree, GtkCTreeNode *node,
                                sibling = GTK_CTREE_ROW(prev)->sibling; \
                        else \
                                sibling = GTK_CTREE_ROW(parent)->children; \
+                       while (sibling) { \
+                               FolderItem *tmp; \
+ \
+                               tmp = gtk_ctree_node_get_row_data \
+                                       (ctree, sibling); \
+                               if (tmp->stype != F_NORMAL) \
+                                       sibling = GTK_CTREE_ROW(sibling)->sibling; \
+                               else \
+                                       break; \
+                       } \
                        if (node != sibling) \
                                gtk_ctree_move(ctree, node, parent, sibling); \
                } \
@@ -1309,7 +1319,7 @@ static void folderview_sort_folders(FolderView *folderview, GtkCTreeNode *root,
 
        gtk_sctree_sort_recursive(ctree, root);
 
-       if (GTK_CTREE_ROW(root)->parent) return;
+       if (root && GTK_CTREE_ROW(root)->parent) return;
 
        SET_SPECIAL_FOLDER(ctree, folder->inbox);
        SET_SPECIAL_FOLDER(ctree, folder->outbox);
@@ -1842,6 +1852,8 @@ void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
        GtkCTreeNode *node, *parent_node;
        
        parent_node = gtk_ctree_find_by_row_data(ctree, NULL, item->parent);
+       if (parent_node == NULL)
+               return;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
@@ -1908,8 +1920,6 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
        } 
        g_free(new_folder);
 
-       folderview_create_folder_node(folderview, new_item);
-
        folder_write_list();
 }
 
@@ -1944,8 +1954,6 @@ static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
        g_free(new_folder);
        if (!new_item) return;
 
-       folderview_create_folder_node(folderview, new_item);
-
        folder_write_list();
 }
 
@@ -2118,6 +2126,14 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
        Xstrdup_a(old_path, item->path, return);
        old_id = folder_item_get_identifier(item);
 
+       if (folderview->opened == folderview->selected ||
+           gtk_ctree_is_ancestor(ctree,
+                                 folderview->selected,
+                                 folderview->opened)) {
+               summary_clear_all(folderview->summaryview);
+               folderview->opened = NULL;
+       }
+
        if (item->folder->klass->remove_folder(item->folder, item) < 0) {
                alertpanel_error(_("Can't remove the folder `%s'."), name);
                if (folderview->opened == folderview->selected)
@@ -2127,18 +2143,6 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       /* if (FOLDER_TYPE(item->folder) == F_MH)
-               prefs_filtering_delete_path(old_path); */
-
-       if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
-                                 folderview->selected,
-                                 folderview->opened)) {
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-       }
-
-       gtk_ctree_remove_node(ctree, folderview->selected);
        folder_write_list();
 
        prefs_filtering_delete_path(old_id);
@@ -2174,10 +2178,11 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
        g_free(message);
        if (avalue != G_ALERTDEFAULT) return;
 
-       folder_destroy(item->folder);
-       summary_clear_all(folderview->summaryview);
        folderview_unselect(folderview);
+       summary_clear_all(folderview->summaryview);
        gtk_ctree_remove_node(ctree, node);
+
+       folder_destroy(item->folder);
        folder_write_list();
 }
 
@@ -2234,8 +2239,6 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        }
        g_free(new_folder);
 
-       folderview_create_folder_node(folderview, new_item);
-
        folder_write_list();
 }
 
@@ -2479,7 +2482,6 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        if (item->parent == NULL && item->folder->account)
                account_open(item->folder->account);
        else {
-               summary_save_prefs_to_folderitem(folderview->summaryview, item);
                prefs_folder_item_open(item);
        }
 }
@@ -2560,13 +2562,6 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
                folder_item_update_thaw();
-               if (src_node)
-                       gtk_ctree_remove_node(GTK_CTREE(folderview->ctree), src_node);
-               else 
-                       debug_print("can't remove src node: is null\n");
-
-               folderview_create_folder_node_recursive(folderview, new_folder);
-
                folder_item_update_recursive(new_folder, F_ITEM_UPDATE_MSGCNT);
 
                folderview_sort_folders(folderview, 
@@ -2768,9 +2763,16 @@ gboolean folderview_update_folder(gpointer source, gpointer userdata)
        ctree = folderview->ctree;
        g_return_val_if_fail(ctree != NULL, FALSE);
 
-       if (hookdata->update_flags & FOLDER_TREE_CHANGED) {
+       if (hookdata->update_flags & FOLDER_NEW_FOLDERITEM)
+               folderview_create_folder_node(folderview, hookdata->item);
+       else if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) {
+               GtkCTreeNode *node;
+
+               node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
+               if (node != NULL)
+                       gtk_ctree_remove_node(GTK_CTREE(ctree), node);
+       } else if (hookdata->update_flags & FOLDER_TREE_CHANGED)
                folderview_set(folderview);
-       }
 
        return FALSE;
 }
@@ -2938,4 +2940,3 @@ static void folderview_drag_end_cb(GtkWidget          *widget,
        g_slist_free(folderview->nodes_to_recollapse);
        folderview->nodes_to_recollapse = NULL;
 }
-