use the colour from the folder pref unless the folder has new messages
[claws.git] / src / folderview.c
index a103308f1435f0e5a26ba94e1e8a33bebd5c0ea4..9d317cfe7aaff1873b3c9a23dfdbd6cef3efb180 100644 (file)
@@ -261,9 +261,14 @@ static void folderview_drag_data_get     (GtkWidget        *widget,
                                          guint             info,
                                          guint             time,
                                          FolderView       *folderview);
+static void folderview_drag_end_cb      (GtkWidget        *widget,
+                                         GdkDragContext   *drag_context,
+                                         FolderView       *folderview);
 
 void folderview_create_folder_node       (FolderView       *folderview, 
                                          FolderItem       *item);
+gboolean folderview_update_folder       (gpointer          source,
+                                         gpointer          userdata);
 gboolean folderview_update_item                 (gpointer          source,
                                          gpointer          data);
 
@@ -350,6 +355,10 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
        {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
+GtkTargetEntry folderview_drag_types[] =
+{
+       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+};
 
 FolderView *folderview_create(void)
 {
@@ -439,7 +448,7 @@ FolderView *folderview_create(void)
                sizeof(folderview_mbox_popup_entries[0]);
        mbox_popup = menu_create_items(folderview_mbox_popup_entries,
                                       n_entries,
-                                      "<MailFolder>", &mbox_factory,
+                                      "<MboxFolder>", &mbox_factory,
                                       folderview);
 
        gtk_signal_connect(GTK_OBJECT(ctree), "key_press_event",
@@ -484,10 +493,9 @@ FolderView *folderview_create(void)
                           folderview);
 
         /* drop callback */
-       gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL &
-                         ~GTK_DEST_DEFAULT_HIGHLIGHT,
+       gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL & ~GTK_DEST_DEFAULT_HIGHLIGHT,
                          summary_drag_types, 1,
-                         GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT);
+                         GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_DEFAULT);
        gtk_signal_connect(GTK_OBJECT(ctree), "drag_motion",
                           GTK_SIGNAL_FUNC(folderview_drag_motion_cb),
                           folderview);
@@ -497,6 +505,9 @@ FolderView *folderview_create(void)
        gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_received",
                           GTK_SIGNAL_FUNC(folderview_drag_received_cb),
                           folderview);
+       gtk_signal_connect(GTK_OBJECT(ctree), "drag_end",
+                          GTK_SIGNAL_FUNC(folderview_drag_end_cb),
+                          folderview);
 
        folderview->scrolledwin  = scrolledwin;
        folderview->ctree        = ctree;
@@ -509,11 +520,14 @@ FolderView *folderview_create(void)
        folderview->mbox_popup   = mbox_popup;
        folderview->mbox_factory = mbox_factory;
 
+       folderview->folder_update_callback_id =
+               hooks_register_hook(FOLDER_UPDATE_HOOKLIST, folderview_update_folder, (gpointer) folderview);
        folderview->folder_item_update_callback_id =
                hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
 
        gtk_widget_show_all(scrolledwin);
 
+       folderview->target_list = gtk_target_list_new(folderview_drag_types, 1);
        folderview_list = g_list_append(folderview_list, folderview);
 
        return folderview;
@@ -705,7 +719,7 @@ static GtkCTreeNode *folderview_find_next_unread(GtkCTree *ctree,
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                item = gtk_ctree_node_get_row_data(ctree, node);
-               if (item && item->unread > 0 && item->stype != F_TRASH)
+               if (item && item->unread_msgs > 0 && item->stype != F_TRASH)
                        return node;
        }
 
@@ -751,19 +765,6 @@ void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
        unread = atoi(unread_str);
        total = atoi(total_str);
 
-       /* CLAWS: don't know why but this always seems to be true
-        * when deleting messages. Somewhere claws does a folder
-        * scan which sets all new, unread & total to the correct
-        * values. It then enters this function, but leaves it
-        * because new, unread and total are the same... */
-#ifndef CLAWS   
-       if (prev_row     == row    &&
-           item->new    == new    &&
-           item->unread == unread &&
-           item->total  == total)
-               return;
-#endif         
-
        prev_row = row;
 
        folderview_update_node(folderview, row);
@@ -783,18 +784,6 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
                                      gpointer data)
 {
        GList *list;
-       gchar *rootpath;
-
-       if (FOLDER_IS_LOCAL(folder))
-               rootpath = LOCAL_FOLDER(folder)->rootpath;
-       else if (FOLDER_TYPE(folder) == F_IMAP && folder->account &&
-                folder->account->recv_server)
-               rootpath = folder->account->recv_server;
-       else if (FOLDER_TYPE(folder) == F_NEWS && folder->account &&
-                folder->account->nntp_server)
-               rootpath = folder->account->nntp_server;
-       else
-               return;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                FolderView *folderview = (FolderView *)list->data;
@@ -803,11 +792,11 @@ static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
 
                if (item->path)
                        str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
-                                             rootpath, G_DIR_SEPARATOR,
+                                             item->folder->name, G_DIR_SEPARATOR,
                                              item->path);
                else
                        str = g_strdup_printf(_("Scanning folder %s ..."),
-                                             rootpath);
+                                             item->folder->name);
 
                STATUSBAR_PUSH(mainwin, str);
                STATUSBAR_POP(mainwin);
@@ -844,7 +833,7 @@ void folderview_rescan_tree(Folder *folder)
 
        g_return_if_fail(folder != NULL);
 
-       if (!folder->class->scan_tree) return;
+       if (!folder->klass->scan_tree) return;
 
        inc_lock();
        window = label_window_create(_("Rebuilding folder tree..."));
@@ -855,46 +844,10 @@ void folderview_rescan_tree(Folder *folder)
 
        folderview_set_all();
 
-       folderview_check_new(folder);
-       
        gtk_widget_destroy(window);
        inc_unlock();
 }
 
-#if 0
-void folderview_rescan_all(void)
-{
-       GList *list;
-       GtkWidget *window;
-
-       inc_lock();
-       window = label_window_create(_("Rescanning all folder trees..."));
-
-       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();
-
-       list = folder_get_list();
-       for (; list != NULL; list = list->next) {
-               Folder *folder = list->data;
-
-               folderview_check_new(folder);
-       }
-
-       gtk_widget_destroy(window);
-       inc_unlock();
-}
-#endif
-
 /** folderview_check_new()
  *  Scan and update the folder and return the 
  *  count the number of new messages since last check. 
@@ -929,13 +882,13 @@ gint folderview_check_new(Folder *folder)
                        if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
 
                        folderview_scan_tree_func(item->folder, item, NULL);
-                       former_new = item->new;
+                       former_new = item->new_msgs;
                        if (folder_item_scan(item) < 0) {
                                if (folder && !FOLDER_IS_LOCAL(folder))
                                        break;
                        }
                        folderview_update_node(folderview, node);
-                       new_msgs += item->new;
+                       new_msgs += item->new_msgs;
                        former_new_msgs += former_new;
                }
 
@@ -990,8 +943,8 @@ static gboolean folderview_search_new_recursive(GtkCTree *ctree,
        if (node) {
                item = gtk_ctree_node_get_row_data(ctree, node);
                if (item) {
-                       if (item->new > 0 ||
-                           (item->stype == F_QUEUE && item->total > 0))
+                       if (item->new_msgs > 0 ||
+                           (item->stype == F_QUEUE && item->total_msgs > 0))
                                return TRUE;
                }
                node = GTK_CTREE_ROW(node)->children;
@@ -1036,8 +989,8 @@ static gboolean folderview_search_unread_recursive(GtkCTree *ctree,
        if (node) {
                item = gtk_ctree_node_get_row_data(ctree, node);
                if (item) {
-                       if (item->unread > 0 ||
-                           (item->stype == F_QUEUE && item->total > 0))
+                       if (item->unread_msgs > 0 ||
+                           (item->stype == F_QUEUE && item->total_msgs > 0))
                                return TRUE;
                }
                node = GTK_CTREE_ROW(node)->children;
@@ -1170,21 +1123,21 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        else
                add_unread_mark = FALSE;
 
-       if (item->stype == F_QUEUE && item->total > 0 &&
+       if (item->stype == F_QUEUE && item->total_msgs > 0 &&
            prefs_common.display_folder_unread) {
-               str = g_strdup_printf("%s (%d%s)", name, item->total,
+               str = g_strdup_printf("%s (%d%s)", name, item->total_msgs,
                                      add_unread_mark ? "+" : "");
                gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
                                        FALSE, GTK_CTREE_ROW(node)->expanded);
                g_free(str);
-       } else if ((item->unread > 0 || add_unread_mark) &&
+       } else if ((item->unread_msgs > 0 || add_unread_mark) &&
                 prefs_common.display_folder_unread) {
 
-               if (item->unread > 0)
-                       str = g_strdup_printf("%s (%d%s%s)", name, item->unread,
+               if (item->unread_msgs > 0)
+                       str = g_strdup_printf("%s (%d%s%s)", name, item->unread_msgs,
                                              add_unread_mark ? "+" : "", 
-                                             item->unreadmarked > 0 ? "!":"");
+                                             item->unreadmarked_msgs > 0 ? "!":"");
                else
                        str = g_strdup_printf("%s (+)", name);
                gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
@@ -1193,7 +1146,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                g_free(str);
        } else {
                str = g_strdup_printf("%s%s", name, 
-                                     item->unreadmarked > 0 ? " (!)":"");
+                                     item->unreadmarked_msgs > 0 ? " (!)":"");
        
                gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
@@ -1207,9 +1160,9 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                gtk_ctree_node_set_text(ctree, node, COL_UNREAD, "-");
                gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  "-");
        } else {
-               gtk_ctree_node_set_text(ctree, node, COL_NEW,    itos(item->new));
-               gtk_ctree_node_set_text(ctree, node, COL_UNREAD, itos(item->unread));
-               gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  itos(item->total));
+               gtk_ctree_node_set_text(ctree, node, COL_NEW,    itos(item->new_msgs));
+               gtk_ctree_node_set_text(ctree, node, COL_UNREAD, itos(item->unread_msgs));
+               gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  itos(item->total_msgs));
        }
 
        if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
@@ -1217,23 +1170,31 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                use_bold = use_color = FALSE;
        } else if (item->stype == F_QUEUE) {
                /* highlight queue folder if there are any messages */
-               use_bold = use_color = (item->total > 0);
+               use_bold = use_color = (item->total_msgs > 0);
        } else {
                /* if unread messages exist, print with bold font */
-               use_bold = (item->unread > 0) || add_unread_mark;
+               use_bold = (item->unread_msgs > 0) || add_unread_mark;
                /* if new messages exist, print with colored letter */
                use_color =
-                       (item->new > 0) ||
+                       (item->new_msgs > 0) ||
                        (add_unread_mark &&
                         folderview_have_new_children(folderview, node));       
        }
 
        gtk_ctree_node_set_foreground(ctree, node, NULL);
 
-       if (use_bold && use_color) {
-               style = bold_color_style;
-       } else if (use_bold) {
-               style = bold_style;
+       if (use_bold) {
+               if (item->prefs->color > 0 && !use_color) {
+                       GdkColor gdk_color;
+
+                       gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
+                       color_style = gtk_style_copy(bold_style);
+                       color_style->fg[GTK_STATE_NORMAL] = gdk_color;
+                       style = color_style;
+               } else if (use_color)
+                       style = bold_color_style;
+               else
+                       style = bold_style;
                if (item->op_count > 0) {
                        style = bold_tgtfold_style;
                }
@@ -1413,6 +1374,7 @@ void folderview_rename_folder(FolderView *folderview)
        switch (FOLDER_TYPE(item->folder)) {
        case F_MBOX:
                folderview_rename_mbox_folder_cb(folderview, 0, NULL);
+               break;
        case F_MH:
        case F_MAILDIR:
        case F_IMAP:
@@ -1538,7 +1500,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                        if (item->parent != NULL)
                                delete_folder = folder_scoring = folder_processing = TRUE;
                }
-               if (item->unread < 1) 
+               if (item->unread_msgs < 1) 
                        mark_all_read = FALSE;
        }
 
@@ -2032,7 +1994,7 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
        old_id = folder_item_get_identifier(item);
 
-       if (item->folder->class->rename_folder(item->folder, item, new_folder) < 0) {
+       if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
                g_free(old_id);
                g_free(new_folder);
                return;
@@ -2099,7 +2061,7 @@ static void folderview_rename_mbox_folder_cb(FolderView *folderview,
                return;
        }
 
-       if (item->folder->class->rename_folder(item->folder, item, new_folder) < 0) {
+       if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
                g_free(new_folder);
                return;
        }
@@ -2153,7 +2115,7 @@ 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 (item->folder->class->remove_folder(item->folder, item) < 0) {
+       if (item->folder->klass->remove_folder(item->folder, item) < 0) {
                alertpanel_error(_("Can't remove the folder `%s'."), name);
                if (folderview->opened == folderview->selected)
                        summary_show(folderview->summaryview,
@@ -2515,7 +2477,7 @@ static void folderview_property_cb(FolderView *folderview, guint action,
                account_open(item->folder->account);
        else {
                summary_save_prefs_to_folderitem(folderview->summaryview, item);
-               prefs_folder_item_create(folderview, item);
+               prefs_folder_item_open(item);
        }
 }
 
@@ -2539,6 +2501,18 @@ static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *no
        g_slist_free(done);
 }
 
+static void folderview_recollapse_all_nodes(FolderView *folderview)
+{
+       GSList *list = folderview->nodes_to_recollapse;
+       if (!list) return;
+       for (; list != NULL; list = g_slist_next(list))
+               if (list->data) 
+                       gtk_ctree_collapse(GTK_CTREE(folderview->ctree), 
+                                          GTK_CTREE_NODE(list->data));
+       g_slist_free(folderview->nodes_to_recollapse);  
+       folderview->nodes_to_recollapse = NULL;
+}
+
 static void folderview_move_to_cb(FolderView *folderview) 
 {
        FolderItem *from_folder = NULL, *to_folder = NULL;
@@ -2577,16 +2551,21 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
        inc_lock();
        main_window_cursor_wait(folderview->mainwin);
        statusbar_verbosity_set(TRUE);
+       folder_item_update_freeze();
        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);
+               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, 
                        gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), 
                                NULL, new_folder->parent), new_folder->folder);
@@ -2595,6 +2574,7 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
                statusbar_verbosity_set(FALSE);         
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
+               folder_item_update_thaw();
                switch (status) {
                case F_MOVE_FAILED_DEST_IS_PARENT:
                        alertpanel_error(_("Source and destination are the same."));
@@ -2614,6 +2594,184 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
        gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), TRUE);
 }
 
+static gint folderview_clist_compare(GtkCList *clist,
+                                    gconstpointer ptr1, gconstpointer ptr2)
+{
+       FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
+       FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
+
+       if (!item1->name)
+               return (item2->name != NULL);
+       if (!item2->name)
+               return -1;
+
+       return g_strcasecmp(item1->name, item2->name);
+}
+
+static gint folderview_compare_name(gconstpointer a, gconstpointer b)
+{
+       const FolderItem *item = a;
+       const gchar *name = b;
+
+       if (!item->path) return -1;
+       return strcmp2(g_basename(item->path), name);
+}
+
+static void folderview_scoring_cb(FolderView *folderview, guint action,
+                                  GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+       prefs_scoring_open(item);
+}
+
+static void folderview_processing_cb(FolderView *folderview, guint action,
+                                    GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+       prefs_filtering_open(item, NULL, NULL);
+}
+
+void folderview_set_target_folder_color(gint color_op) 
+{
+       gint firstone = 1;
+       GList *list;
+       FolderView *folderview;
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               gtkut_convert_int_to_gdk_color(color_op, &folderview->color_op);
+               if (firstone) {
+                       bold_tgtfold_style->fg[GTK_STATE_NORMAL] =
+                               folderview->color_op;
+                       firstone = 0;
+               }
+       }
+}
+
+void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
+{
+       folderview_init(folderview);
+       folderview_set_all();
+}
+
+static void drag_state_stop(FolderView *folderview)
+{
+       if (folderview->drag_timer)
+               gtk_timeout_remove(folderview->drag_timer);
+       folderview->drag_timer = 0;
+       folderview->drag_node = NULL;
+}
+
+static gint folderview_defer_expand(FolderView *folderview)
+{
+       if (folderview->drag_node) {
+               folderview_recollapse_nodes(folderview, folderview->drag_node);
+               if (folderview->drag_item->collapsed) {
+                       gtk_ctree_expand(GTK_CTREE(folderview->ctree), folderview->drag_node);
+                       folderview->nodes_to_recollapse = g_slist_append
+                               (folderview->nodes_to_recollapse, folderview->drag_node);
+               }
+       }
+       folderview->drag_item  = NULL;
+       folderview->drag_timer = 0;
+       return FALSE;
+}
+
+static void drag_state_start(FolderView *folderview, GtkCTreeNode *node, FolderItem *item)
+{
+       /* the idea is that we call drag_state_start() whenever we want expansion to
+        * start after 'prefs_common.hover_time' msecs. if we want to cancel expansion,
+        * we need to call drag_state_stop() */
+       drag_state_stop(folderview);
+       /* request expansion */
+       if (0 != (folderview->drag_timer = gtk_timeout_add
+                       (prefs_common.hover_timeout, 
+                        (GtkFunction)folderview_defer_expand,
+                        folderview))) {
+               folderview->drag_node = node;
+               folderview->drag_item = item;
+       }                        
+}
+
+static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
+                                 FolderView       *folderview)
+{
+       GdkDragContext *context;
+
+       g_return_if_fail(folderview != NULL);
+       if (folderview->selected == NULL) return;
+       if (folderview->nodes_to_recollapse) 
+               g_slist_free(folderview->nodes_to_recollapse);
+       folderview->nodes_to_recollapse = NULL;
+       context = gtk_drag_begin(widget, folderview->target_list,
+                                GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
+       gtk_drag_set_icon_default(context);
+}
+
+static void folderview_drag_data_get(GtkWidget        *widget,
+                                    GdkDragContext   *drag_context,
+                                    GtkSelectionData *selection_data,
+                                    guint             info,
+                                    guint             time,
+                                    FolderView       *folderview)
+{
+       FolderItem *item;
+       GList *cur;
+       gchar *source=NULL;
+       
+       for (cur = GTK_CLIST(folderview->ctree)->selection;
+            cur != NULL; cur = cur->next) {
+               item = gtk_ctree_node_get_row_data
+                       (GTK_CTREE(folderview->ctree), 
+                        GTK_CTREE_NODE(cur->data));
+               if (item) {
+                       source = g_strdup_printf ("FROM_OTHER_FOLDER%s", folder_item_get_identifier(item));
+                       gtk_selection_data_set(selection_data,
+                                              selection_data->target, 8,
+                                              source, strlen(source));
+                       break;
+               } else
+                       return;
+       }
+}
+
+gboolean folderview_update_folder(gpointer source, gpointer userdata)
+{
+       FolderUpdateData *hookdata;
+       FolderView *folderview;
+       GtkWidget *ctree;
+
+       hookdata = source;
+       folderview = (FolderView *) userdata;   
+       g_return_val_if_fail(hookdata != NULL, FALSE);
+       g_return_val_if_fail(folderview != NULL, FALSE);
+
+       ctree = folderview->ctree;
+       g_return_val_if_fail(ctree != NULL, FALSE);
+
+       if (hookdata->update_flags & FOLDER_TREE_CHANGED) {
+               folderview_set(folderview);
+       }
+
+       return FALSE;
+}
+
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -2622,7 +2780,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          FolderView     *folderview)
 {
        gint row, column;
-       FolderItem *item, *src_item;
+       FolderItem *item, *src_item = NULL;
        GtkCTreeNode *node = NULL;
        gboolean acceptable = FALSE;
        gint height = folderview->ctree->allocation.height;
@@ -2663,16 +2821,9 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                        
        }
 
-       if (acceptable || (src_item && src_item == item)) {
-               folderview_recollapse_nodes(folderview, node);
-               if (item->collapsed) {
-                       gtk_ctree_expand(GTK_CTREE(widget), node);
-                       folderview->nodes_to_recollapse = g_slist_append(
-                                                               folderview->nodes_to_recollapse,
-                                                               node);
-               }
-       }
-               
+       if (acceptable || (src_item && src_item == item))
+               drag_state_start(folderview, node, item);
+       
        if (acceptable) {
                gtk_signal_handler_block_by_func
                        (GTK_OBJECT(widget),
@@ -2697,6 +2848,7 @@ static void folderview_drag_leave_cb(GtkWidget      *widget,
                                     guint           time,
                                     FolderView     *folderview)
 {
+       drag_state_stop(folderview);
        gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
 }
 
@@ -2713,6 +2865,7 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
        FolderItem *item, *src_item;
        GtkCTreeNode *node;
 
+       drag_state_stop(folderview);
        if ((void *)strstr(data->data, "FROM_OTHER_FOLDER") != (void *)data->data) {
                /* comes from summaryview */
                if (gtk_clist_get_selection_info
@@ -2774,130 +2927,12 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
        folderview->nodes_to_recollapse = NULL;
 }
 
-static gint folderview_clist_compare(GtkCList *clist,
-                                    gconstpointer ptr1, gconstpointer ptr2)
-{
-       FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
-       FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
-
-       if (!item1->name)
-               return (item2->name != NULL);
-       if (!item2->name)
-               return -1;
-
-       return g_strcasecmp(item1->name, item2->name);
-}
-
-static gint folderview_compare_name(gconstpointer a, gconstpointer b)
-{
-       const FolderItem *item = a;
-       const gchar *name = b;
-
-       if (!item->path) return -1;
-       return strcmp2(g_basename(item->path), name);
-}
-
-static void folderview_scoring_cb(FolderView *folderview, guint action,
-                                  GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-
-       if (!folderview->selected) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-
-       prefs_scoring_open(item);
-}
-
-static void folderview_processing_cb(FolderView *folderview, guint action,
-                                    GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-
-       if (!folderview->selected) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-
-       prefs_filtering_open(item, NULL, NULL);
-}
-
-void folderview_set_target_folder_color(gint color_op) 
+static void folderview_drag_end_cb(GtkWidget       *widget, 
+                                  GdkDragContext   *drag_context,
+                                   FolderView      *folderview)
 {
-       gint firstone = 1;
-       GList *list;
-       FolderView *folderview;
-
-       for (list = folderview_list; list != NULL; list = list->next) {
-               folderview = (FolderView *)list->data;
-               gtkut_convert_int_to_gdk_color(color_op, &folderview->color_op);
-               if (firstone) {
-                       bold_tgtfold_style->fg[GTK_STATE_NORMAL] =
-                               folderview->color_op;
-                       firstone = 0;
-               }
-       }
-}
-
-void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
-{
-       folderview_init(folderview);
-       folderview_set_all();
-}
-
-GtkTargetEntry folderview_drag_types[1] =
-{
-       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
-};
-
-
-static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
-                                 FolderView       *folderview)
-{
-       GtkTargetList *list;
-       GdkDragContext *context;
-
-       g_return_if_fail(folderview != NULL);
-       if (folderview->selected == NULL) return;
-
-       list = gtk_target_list_new(folderview_drag_types, 1);
-
-       folderview->nodes_to_recollapse = NULL; /* in case the last drag has been cancelled */
-       
-       context = gtk_drag_begin(widget, list,
-                                GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
-       gtk_drag_set_icon_default(context);
-}
-
-static void folderview_drag_data_get(GtkWidget        *widget,
-                                    GdkDragContext   *drag_context,
-                                    GtkSelectionData *selection_data,
-                                    guint             info,
-                                    guint             time,
-                                    FolderView       *folderview)
-{
-       FolderItem *item;
-       GList *cur;
-       gchar *source=NULL;
-       
-       for (cur = GTK_CLIST(folderview->ctree)->selection;
-            cur != NULL; cur = cur->next) {
-               item = gtk_ctree_node_get_row_data
-                       (GTK_CTREE(folderview->ctree), 
-                        GTK_CTREE_NODE(cur->data));
-               if (item) {
-                       source = g_strdup_printf ("FROM_OTHER_FOLDER%s", folder_item_get_identifier(item));
-                       gtk_selection_data_set(selection_data,
-                                              selection_data->target, 8,
-                                              source, strlen(source));
-                       break;
-               } else
-                       return;
-       }
+       drag_state_stop(folderview);
+       g_slist_free(folderview->nodes_to_recollapse);
+       folderview->nodes_to_recollapse = NULL;
 }