2007-02-19 [colin] 2.7.2cvs52
[claws.git] / src / folderview.c
index 55607d541a7ef773291eea6e91de91b8ea9b77cc..4be46d252921dfddf350ba795a8ccf7729039c49 100644 (file)
@@ -180,7 +180,6 @@ static GdkBitmap *unreadxpmmask;
 static GdkPixmap *readxpm;
 static GdkBitmap *readxpmmask;
 
-
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
 static void folderview_set_folders      (FolderView    *folderview);
@@ -273,11 +272,11 @@ static void folderview_drag_end_cb         (GtkWidget        *widget,
                                          GdkDragContext   *drag_context,
                                          FolderView       *folderview);
 
-void folderview_create_folder_node       (FolderView       *folderview, 
+static void folderview_create_folder_node       (FolderView       *folderview, 
                                          FolderItem       *item);
-gboolean folderview_update_folder       (gpointer          source,
+static gboolean folderview_update_folder        (gpointer          source,
                                          gpointer          userdata);
-gboolean folderview_update_item_claws   (gpointer          source,
+static gboolean folderview_update_item_claws    (gpointer          source,
                                          gpointer          data);
 static void folderview_processing_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget);
@@ -443,7 +442,7 @@ static gboolean folderview_popup_menu(GtkWidget *widget, gpointer data)
 }
 
 
-GtkWidget *folderview_ctree_create(FolderView *folderview)
+static GtkWidget *folderview_ctree_create(FolderView *folderview)
 {
        GtkWidget *ctree;
        gint *col_pos;
@@ -711,6 +710,7 @@ void folderview_set(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        MainWindow *mainwin = folderview->mainwin;
+       FolderItem *sel_item = NULL, *op_item = NULL;
 
        if (!mainwin)
                return;
@@ -720,16 +720,24 @@ void folderview_set(FolderView *folderview)
 
        main_window_cursor_wait(mainwin);
 
+       if (folderview->selected)
+               sel_item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       if (folderview->opened)
+               op_item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+
        folderview->selected = NULL;
        folderview->opened = NULL;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
        gtk_clist_clear(GTK_CLIST(ctree));
-       gtk_clist_thaw(GTK_CLIST(ctree));
-       gtk_clist_freeze(GTK_CLIST(ctree));
 
        folderview_set_folders(folderview);
 
+       if (sel_item)
+               folderview->selected = gtk_ctree_find_by_row_data(ctree, NULL, sel_item);
+       if (op_item)
+               folderview->opened = gtk_ctree_find_by_row_data(ctree, NULL, op_item);
+
        gtk_clist_thaw(GTK_CLIST(ctree));
        main_window_cursor_normal(mainwin);
        STATUSBAR_POP(mainwin);
@@ -975,75 +983,6 @@ FolderItem *folderview_get_selected_item(FolderView *folderview)
        return gtk_ctree_node_get_row_data(ctree, folderview->selected);
 }
 
-void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       static GtkCTreeNode *prev_row = NULL;
-       FolderItem *item;
-       gint new, unread, total;
-       gchar *new_str, *unread_str, *total_str;
-       gint *col_pos = folderview->col_pos;
-
-       if (!row) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, row);
-       if (!item) return;
-
-       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_NEW], &new_str);
-       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_UNREAD], &unread_str);
-       gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_TOTAL], &total_str);
-       new = atoi(new_str);
-       unread = atoi(unread_str);
-       total = atoi(total_str);
-
-       prev_row = row;
-
-       folderview_update_node(folderview, row);
-}
-
-void folderview_append_item(FolderItem *item)
-{
-       GList *list;
-       
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       if (folder_item_parent(item)) return;
-
-       for (list = folderview_list; list != NULL; list = list->next) {
-               FolderView *folderview = (FolderView *)list->data;
-               GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-               GtkCTreeNode *node, *child;
-               gint *col_pos = folderview->col_pos;
-
-               node = gtk_ctree_find_by_row_data(ctree, NULL, 
-                                                 folder_item_parent(item));
-               if (node) {
-                       child = gtk_ctree_find_by_row_data(ctree, node, item);
-                       if (!child) {
-                               gchar *text[N_FOLDER_COLS] =
-                                       {NULL, "0", "0", "0"};
-
-                               gtk_clist_freeze(GTK_CLIST(ctree));
-
-                               text[col_pos[F_COL_FOLDER]] = item->name;
-                               child = gtk_sctree_insert_node
-                                       (ctree, node, NULL, text,
-                                        FOLDER_SPACING,
-                                        folderxpm, folderxpmmask,
-                                        folderopenxpm, folderopenxpmmask,
-                                        FALSE, FALSE);
-                               gtk_ctree_node_set_row_data(ctree, child, item);
-                               gtk_ctree_expand(ctree, node);
-                               folderview_update_node(folderview, child);
-                               folderview_sort_folders(folderview, node,
-                                                       item->folder);
-
-                               gtk_clist_thaw(GTK_CLIST(ctree));
-                       }
-               }
-       }
-}
-
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
@@ -1082,6 +1021,10 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
 void folderview_rescan_tree(Folder *folder, gboolean rebuild)
 {
        GtkWidget *window;
+       MainWindow *mainwin = mainwindow_get_mainwindow();
+       FolderView *folderview = NULL;
+       GtkAdjustment *pos = NULL;
+       gint height = 0;
 
        g_return_if_fail(folder != NULL);
 
@@ -1103,12 +1046,66 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
        else 
                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 = pos->value;
+       }
+
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
        folder_scan_tree(folder, rebuild);
        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_widget_destroy(window);
+       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;
+
+       g_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 = pos->value;
+       }
+
+       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_widget_destroy(window);
        inc_unlock();
 }
@@ -1654,7 +1651,7 @@ void folderview_update_search_icon(FolderItem *item, gboolean matches)
        }
 }
 
-gboolean folderview_update_item_claws(gpointer source, gpointer data)
+static gboolean folderview_update_item_claws(gpointer source, gpointer data)
 {
        FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
        FolderView *folderview = (FolderView *)data;
@@ -1671,7 +1668,10 @@ gboolean folderview_update_item_claws(gpointer source, gpointer data)
        if (node) {
                if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
                        folderview_update_node(folderview, node);
-               if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
+
+               if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && 
+                    update_info->item == folderview->summaryview->folder_item &&
+                    update_info->item != NULL)
                        if (!quicksearch_is_active(folderview->summaryview->quicksearch))
                                summary_show(folderview->summaryview, update_info->item);
        }
@@ -1679,26 +1679,6 @@ gboolean folderview_update_item_claws(gpointer source, gpointer data)
        return FALSE;
 }
 
-static void folderview_update_item_foreach_func(gpointer key, gpointer val,
-                                               gpointer data)
-{
-       /* CLAWS: share this joy with other hook functions ... */
-       folder_item_update((FolderItem *)key, 
-                          (FolderItemUpdateFlags)GPOINTER_TO_INT(data));
-}
-
-void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
-{
-       GList *list;
-       FolderItemUpdateFlags flags;
-       
-       flags = update_summary ?  F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_MSGCNT
-               : 0;
-       for (list = folderview_list; list != NULL; list = list->next)
-               g_hash_table_foreach(table, folderview_update_item_foreach_func, 
-                                    GINT_TO_POINTER(flags));
-}
-
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
                                      GNode *gnode, GtkCTreeNode *cnode,
                                      gpointer data)
@@ -2027,6 +2007,8 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        START_TIMING("");
        folderview->selected = row;
 
+       debug_print("newly selected %p, opened %p\n", folderview->selected, 
+                       folderview->opened);
        if (folderview->opened == row) {
                folderview->open_folder = FALSE;
                END_TIMING();
@@ -2038,6 +2020,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        gtkut_ctree_set_focus_row(ctree, folderview->opened);
                        gtk_ctree_select(ctree, folderview->opened);
                }
+               folderview->open_folder = FALSE;
                END_TIMING();
                return;
        }
@@ -2198,7 +2181,7 @@ static void folderview_col_resized(GtkCList *clist, gint column, gint width,
        prefs_common.folder_col_size[type] = width;
 }
 
-void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
+static void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
 {
        GNode *srcnode;
 
@@ -2219,7 +2202,7 @@ void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem
        }
 }
 
-void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
+static void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
@@ -2670,7 +2653,7 @@ static void folderview_drag_data_get(GtkWidget        *widget,
        }
 }
 
-gboolean folderview_update_folder(gpointer source, gpointer userdata)
+static gboolean folderview_update_folder(gpointer source, gpointer userdata)
 {
        FolderUpdateData *hookdata;
        FolderView *folderview;
@@ -2809,11 +2792,13 @@ void folderview_finish_dnd(const gchar *data, GdkDragContext *drag_context,
        if (!(item && item->folder && folder_item_parent(item) != NULL
                    && FOLDER_CLASS(item->folder)->add_msg != NULL))
        {
-               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+               gtk_drag_finish(drag_context, FALSE, FALSE, time);
+               debug_print("item doesn't fit\n");                      
                return;
        }       
        if (!list) {
-               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+               gtk_drag_finish(drag_context, FALSE, FALSE, time);
+               debug_print("list is empty\n");                 
                return;
        }
        for (tmp = list; tmp != NULL; tmp = tmp->next) {
@@ -2824,6 +2809,9 @@ void folderview_finish_dnd(const gchar *data, GdkDragContext *drag_context,
                        info->msginfo = NULL;
                        info->file = (gchar *)tmp->data;
                        msglist = g_slist_prepend(msglist, info);
+                       debug_print("file is a mail\n");
+               } else {
+                       debug_print("file isn't a mail\n");
                }
        }
        if (msglist) {
@@ -2927,12 +2915,14 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
 
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                if (!node) {
-                       gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+                       gtk_drag_finish(drag_context, FALSE, FALSE, time);
+                       debug_print("no node\n");               
                        return;
                }
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
                if (!item) {
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+                       debug_print("no item\n");
                        return;
                }
                folderview_finish_dnd(data->data, drag_context, time, item);