inital gtk2 patch
[claws.git] / src / folderview.c
index 694de7e3dc6872d30eb0e447a79877499670bff0..e8f886f4914bd7b6d6a8608d0a10499690e87ff8 100644 (file)
@@ -78,9 +78,6 @@ typedef enum
 
 static GList *folderview_list = NULL;
 
-static GdkFont *normalfont;
-static GdkFont *boldfont;
-
 static GtkStyle *normal_style;
 static GtkStyle *normal_color_style;
 static GtkStyle *bold_style;
@@ -158,13 +155,13 @@ static gint folderview_compare_name       (gconstpointer   a,
                                         gconstpointer   b);
 
 /* callback functions */
-static void folderview_button_pressed  (GtkWidget      *ctree,
-                                        GdkEventButton *event,
-                                        FolderView     *folderview);
-static void folderview_button_released (GtkWidget      *ctree,
-                                        GdkEventButton *event,
-                                        FolderView     *folderview);
-static void folderview_key_pressed     (GtkWidget      *widget,
+static gboolean folderview_button_pressed      (GtkWidget      *ctree,
+                                                GdkEventButton *event,
+                                                FolderView     *folderview);
+static gboolean folderview_button_released     (GtkWidget      *ctree,
+                                                GdkEventButton *event,
+                                                FolderView     *folderview);
+static gboolean folderview_key_pressed (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         FolderView     *folderview);
 static void folderview_selected                (GtkCTree       *ctree,
@@ -261,9 +258,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 +352,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)
 {
@@ -381,7 +387,7 @@ FolderView *folderview_create(void)
                (GTK_SCROLLED_WINDOW(scrolledwin),
                 GTK_POLICY_AUTOMATIC,
                 prefs_common.folderview_vscrollbar_policy);
-       gtk_widget_set_usize(scrolledwin,
+       gtk_widget_set_size_request(scrolledwin,
                             prefs_common.folderview_width,
                             prefs_common.folderview_height);
 
@@ -439,64 +445,66 @@ 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",
-                          GTK_SIGNAL_FUNC(folderview_key_pressed),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "button_press_event",
-                          GTK_SIGNAL_FUNC(folderview_button_pressed),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "button_release_event",
-                          GTK_SIGNAL_FUNC(folderview_button_released),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
-                          GTK_SIGNAL_FUNC(folderview_selected), folderview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "start_drag",
-                          GTK_SIGNAL_FUNC(folderview_start_drag), folderview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_get",
-                          GTK_SIGNAL_FUNC(folderview_drag_data_get),
-                          folderview);
-
-       gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_expand",
-                                GTK_SIGNAL_FUNC(folderview_tree_expanded),
-                                folderview);
-       gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_collapse",
-                                GTK_SIGNAL_FUNC(folderview_tree_collapsed),
-                                folderview);
-
-       gtk_signal_connect(GTK_OBJECT(ctree), "resize_column",
-                          GTK_SIGNAL_FUNC(folderview_col_resized),
-                          folderview);
-
-       gtk_signal_connect(GTK_OBJECT(mail_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(folderview_popup_close),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(imap_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(folderview_popup_close),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(news_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(folderview_popup_close),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(mbox_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(folderview_popup_close),
-                          folderview);
+       g_signal_connect(G_OBJECT(ctree), "key_press_event",
+                        G_CALLBACK(folderview_key_pressed),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "button_press_event",
+                        G_CALLBACK(folderview_button_pressed),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "button_release_event",
+                        G_CALLBACK(folderview_button_released),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "tree_select_row",
+                        G_CALLBACK(folderview_selected), folderview);
+       g_signal_connect(G_OBJECT(ctree), "start_drag",
+                        G_CALLBACK(folderview_start_drag), folderview);
+       g_signal_connect(G_OBJECT(ctree), "drag_data_get",
+                        G_CALLBACK(folderview_drag_data_get),
+                        folderview);
+
+       g_signal_connect_after(G_OBJECT(ctree), "tree_expand",
+                              G_CALLBACK(folderview_tree_expanded),
+                              folderview);
+       g_signal_connect_after(G_OBJECT(ctree), "tree_collapse",
+                              G_CALLBACK(folderview_tree_collapsed),
+                              folderview);
+
+       g_signal_connect(G_OBJECT(ctree), "resize_column",
+                        G_CALLBACK(folderview_col_resized),
+                        folderview);
+
+       g_signal_connect(G_OBJECT(mail_popup), "selection_done",
+                        G_CALLBACK(folderview_popup_close),
+                        folderview);
+       g_signal_connect(G_OBJECT(imap_popup), "selection_done",
+                        G_CALLBACK(folderview_popup_close),
+                        folderview);
+       g_signal_connect(G_OBJECT(news_popup), "selection_done",
+                        G_CALLBACK(folderview_popup_close),
+                        folderview);
+       g_signal_connect(G_OBJECT(mbox_popup), "selection_done",
+                        G_CALLBACK(folderview_popup_close),
+                        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);
-       gtk_signal_connect(GTK_OBJECT(ctree), "drag_motion",
-                          GTK_SIGNAL_FUNC(folderview_drag_motion_cb),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "drag_leave",
-                          GTK_SIGNAL_FUNC(folderview_drag_leave_cb),
-                          folderview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_received",
-                          GTK_SIGNAL_FUNC(folderview_drag_received_cb),
-                          folderview);
+                         GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_DEFAULT);
+       g_signal_connect(G_OBJECT(ctree), "drag_motion",
+                        G_CALLBACK(folderview_drag_motion_cb),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "drag_leave",
+                        G_CALLBACK(folderview_drag_leave_cb),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "drag_data_received",
+                        G_CALLBACK(folderview_drag_received_cb),
+                        folderview);
+       g_signal_connect(G_OBJECT(ctree), "drag_end",
+                        G_CALLBACK(folderview_drag_end_cb),
+                        folderview);
 
        folderview->scrolledwin  = scrolledwin;
        folderview->ctree        = ctree;
@@ -509,11 +517,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;
@@ -526,7 +537,8 @@ void folderview_init(FolderView *folderview)
        GtkWidget *label_unread;
        GtkWidget *hbox_new;
        GtkWidget *hbox_unread;
-
+       
+       gtk_widget_realize(ctree);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE, &inboxxpm, &inboxxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_HRM, &inboxhrmxpm, &inboxhrmxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN, &inboxopenxpm, &inboxopenxpmmask);
@@ -573,16 +585,40 @@ void folderview_init(FolderView *folderview)
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
                        
-
-
-       if (!normalfont)
-               normalfont = gtkut_font_load(NORMAL_FONT);
-       if (!boldfont)
-               boldfont = gtkut_font_load(BOLD_FONT);
-
+#if 0
+       if (!normalfont) {
+               if (gtkut_font_load(NORMAL_FONT) == NULL) {
+                       GtkStyle *style = gtk_style_new();
+                       normalfont = style->font;
+                       gdk_font_ref(normalfont);
+                       gtk_style_unref(style);
+               } 
+               else 
+                       normalfont = gtkut_font_load(NORMAL_FONT);
+       }
+       
+       if (!boldfont) {
+               if (gtkut_font_load(BOLD_FONT) == NULL) {
+                       GtkStyle *style = gtk_style_new();
+                       boldfont = style->font;
+                       gdk_font_ref(boldfont);
+                       gtk_style_unref(style);
+               }
+               else
+                       boldfont = gtkut_font_load(BOLD_FONT);
+       }
+#endif
+       
        if (!bold_style) {
+               PangoFontDescription *font_desc;
                bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
-               bold_style->font = boldfont;
+               font_desc = pango_font_description_from_string(BOLD_FONT);
+               if (font_desc) {
+                       if (bold_style->font_desc)
+                               pango_font_description_free
+                                       (bold_style->font_desc);
+                       bold_style->font_desc = font_desc;
+               }
                bold_color_style = gtk_style_copy(bold_style);
                bold_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
 
@@ -590,8 +626,15 @@ void folderview_init(FolderView *folderview)
                bold_tgtfold_style->fg[GTK_STATE_NORMAL] = folderview->color_op;
        }
        if (!normal_style) {
+               PangoFontDescription *font_desc;
                normal_style = gtk_style_copy(gtk_widget_get_style(ctree));
-               normal_style->font = normalfont;
+               font_desc = pango_font_description_from_string(NORMAL_FONT);
+               if (font_desc) {
+                       if (normal_style->font_desc)
+                               pango_font_description_free
+                                       (normal_style->font_desc);
+                       normal_style->font_desc = font_desc;
+               }
                normal_color_style = gtk_style_copy(normal_style);
                normal_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
        }
@@ -661,7 +704,8 @@ static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
        folderview->open_folder = TRUE;
        gtkut_ctree_set_focus_row(ctree, node);
        gtk_ctree_select(ctree, node);
-       if (folderview->summaryview->messages > 0)
+       if (folderview->summaryview->folder_item &&
+           folderview->summaryview->folder_item->total_msgs > 0)
                gtk_widget_grab_focus(folderview->summaryview->ctree);
        else
                gtk_widget_grab_focus(folderview->ctree);
@@ -690,7 +734,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;
        }
 
@@ -736,19 +780,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);
@@ -768,18 +799,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 == F_IMAP && folder->account &&
-                folder->account->recv_server)
-               rootpath = folder->account->recv_server;
-       else if (folder->type == 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;
@@ -788,11 +807,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);
@@ -805,8 +824,8 @@ static GtkWidget *label_window_create(const gchar *str)
        GtkWidget *window;
        GtkWidget *label;
 
-       window = gtk_window_new(GTK_WINDOW_DIALOG);
-       gtk_widget_set_usize(window, 380, 60);
+       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       gtk_widget_set_size_request(window, 380, 60);
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_title(GTK_WINDOW(window), str);
@@ -829,7 +848,7 @@ void folderview_rescan_tree(Folder *folder)
 
        g_return_if_fail(folder != NULL);
 
-       if (!folder->scan_tree) return;
+       if (!folder->klass->scan_tree) return;
 
        inc_lock();
        window = label_window_create(_("Rebuilding folder tree..."));
@@ -840,45 +859,9 @@ 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 
@@ -914,13 +897,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;
                }
 
@@ -975,8 +958,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;
@@ -1021,8 +1004,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;
@@ -1088,9 +1071,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = inboxopenxpm;
                        openmask = inboxopenxpmmask;
                }
-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
-                               item->name);
                break;
        case F_OUTBOX:
                if (item->hide_read_msgs) {
@@ -1104,9 +1084,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = outboxopenxpm;
                        openmask = outboxopenxpmmask;
                }
-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
-                               item->name);
                break;
        case F_QUEUE:
                if (item->hide_read_msgs) {
@@ -1120,9 +1097,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = queueopenxpm;
                        openmask = queueopenxpmmask;
                }
-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
-                               item->name);
                break;
        case F_TRASH:
                if (item->hide_read_msgs) {
@@ -1136,18 +1110,12 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = trashopenxpm;
                        openmask = trashopenxpmmask;
                }
-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, TRASH_DIR) ? _("Trash") :
-                               item->name);
                break;
        case F_DRAFT:
                xpm = draftsxpm;
                mask = draftsxpmmask;
                openxpm = draftsopenxpm;
                openmask = draftsopenxpmmask;
-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
-                               item->name);
                break;
        default:
                if (item->hide_read_msgs) {
@@ -1161,31 +1129,8 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = folderopenxpm;
                        openmask = folderopenxpmmask;
                }
-               if (!item->parent) {
-                       switch (item->folder->type) {
-                       case F_MH:
-                               name = " (MH)"; break;
-                       case F_MBOX:
-                               name = " (mbox)"; break;
-                       case F_IMAP:
-                               name = " (IMAP4)"; break;
-                       case F_NEWS:
-                               name = " (News)"; break;
-                       default:
-                               name = "";
-                       }
-                       name = g_strconcat(item->name, name, NULL);
-               } else {
-                       if (item->folder->type == F_NEWS &&
-                           item->path &&
-                           !strcmp2(item->name, item->path))
-                               name = get_abbrev_newsgroup_name
-                                       (item->path,
-                                        prefs_common.ng_abbrev_len);
-                       else
-                               name = g_strdup(item->name);
-               }
        }
+       name = folder_item_get_name(item);
 
        if (!GTK_CTREE_ROW(node)->expanded &&
            folderview_have_unread_children(folderview, node))
@@ -1193,21 +1138,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,
@@ -1216,7 +1161,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,
@@ -1230,9 +1175,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 ||
@@ -1240,23 +1185,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;
                }
@@ -1353,6 +1306,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); \
                } \
@@ -1369,7 +1332,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);
@@ -1403,7 +1366,7 @@ void folderview_new_folder(FolderView *folderview)
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       switch (item->folder->type) {
+       switch (FOLDER_TYPE(item->folder)) {
        case F_MBOX:
                folderview_new_mbox_folder_cb(folderview, 0, NULL);
                break;
@@ -1433,9 +1396,10 @@ void folderview_rename_folder(FolderView *folderview)
        if (!item->path) return;
        if (item->stype != F_NORMAL) return;
 
-       switch (item->folder->type) {
+       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:
@@ -1460,7 +1424,7 @@ void folderview_delete_folder(FolderView *folderview)
        if (!item->path) return;
        if (item->stype != F_NORMAL) return;
 
-       switch (item->folder->type) {
+       switch (FOLDER_TYPE(item->folder)) {
        case F_MH:
        case F_MBOX:
        case F_MAILDIR:
@@ -1476,8 +1440,8 @@ void folderview_delete_folder(FolderView *folderview)
 
 /* callback functions */
 
-static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
-                                     FolderView *folderview)
+static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
+                                         FolderView *folderview)
 {
        GtkCList *clist = GTK_CLIST(ctree);
        gint prev_row = -1, row = -1, column = -1;
@@ -1497,11 +1461,11 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        gboolean folder_processing  = FALSE;
        gboolean folder_scoring  = FALSE;
 
-       if (!event) return;
+       if (!event) return FALSE;
 
        if (event->button == 1) {
                folderview->open_folder = TRUE;
-               return;
+               return FALSE;
        }
 
        if (event->button == 2 || event->button == 3) {
@@ -1517,7 +1481,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
 
                if (!gtk_clist_get_selection_info(clist, event->x, event->y,
                                                  &row, &column))
-                       return;
+                       return FALSE;
                if (prev_row != row) {
                        gtk_clist_unselect_all(clist);
                        if (event->button == 2)
@@ -1530,11 +1494,11 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                }
        }
 
-       if (event->button != 3) return;
+       if (event->button != 3) return FALSE;
 
        item = gtk_clist_get_row_data(clist, row);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
+       g_return_val_if_fail(item != NULL, FALSE);
+       g_return_val_if_fail(item->folder != NULL, FALSE);
        folder = item->folder;
 
        if (folderview->mainwin->lock_count == 0) {
@@ -1561,7 +1525,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;
        }
 
@@ -1624,18 +1588,20 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(mbox_factory, "/Processing...", folder_processing);
                SET_SENS(mbox_factory, "/Scoring...", folder_scoring);
        } else
-               return;
+               return FALSE;
 
 #undef SET_SENS
 
        gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL,
                       event->button, event->time);
+
+       return FALSE;
 }
 
-static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
-                                      FolderView *folderview)
+static gboolean folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
+                                          FolderView *folderview)
 {
-       if (!event) return;
+       if (!event) return FALSE;
 
        if (event->button == 1 && folderview->open_folder == FALSE &&
            folderview->opened != NULL) {
@@ -1643,12 +1609,14 @@ static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
                                          folderview->opened);
                gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
        }
+
+       return FALSE;
 }
 
-static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
-                                  FolderView *folderview)
+static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
+                                      FolderView *folderview)
 {
-       if (!event) return;
+       if (!event) return FALSE;
 
        switch (event->keyval) {
        case GDK_Return:
@@ -1660,7 +1628,8 @@ static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_space:
                if (folderview->selected) {
                        if (folderview->opened == folderview->selected &&
-                           folderview->summaryview->messages == 0)
+                           (!folderview->summaryview->folder_item ||
+                            folderview->summaryview->folder_item->total_msgs == 0))
                                folderview_select_next_unread(folderview);
                        else
                                folderview_select_node(folderview,
@@ -1670,6 +1639,8 @@ static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        default:
                break;
        }
+
+       return FALSE;
 }
 
 static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
@@ -1718,7 +1689,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        if (item->folder) 
                toolbar_set_compose_button
                        (folderview->mainwin->toolbar,
-                        item->folder->type == F_NEWS ? 
+                        FOLDER_TYPE(item->folder) == F_NEWS ? 
                         COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
 
        if (item->path)
@@ -1738,7 +1709,8 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        }
 
        /* Open Folder */
-       buf = g_strdup_printf(_("Opening Folder %s..."), item->path);
+       buf = g_strdup_printf(_("Opening Folder %s..."), item->path ? 
+                                       item->path : "(null)");
        debug_print("%s\n", buf);
        STATUSBAR_PUSH(folderview->mainwin, buf);
        g_free(buf);
@@ -1899,6 +1871,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));
 
@@ -1937,7 +1911,7 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
                                  _("NewFolder"));
        if (!new_folder) return;
 
-       if (item->folder->type != F_MBOX) {
+       if (FOLDER_TYPE(item->folder) != F_MBOX) {
                if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
                        alertpanel_error(_("`%c' can't be included in folder name."),
                                         G_DIR_SEPARATOR);
@@ -1965,8 +1939,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();
 }
 
@@ -2001,8 +1973,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();
 }
 
@@ -2054,7 +2024,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->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;
@@ -2121,7 +2091,7 @@ static void folderview_rename_mbox_folder_cb(FolderView *folderview,
                return;
        }
 
-       if (item->folder->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;
        }
@@ -2175,18 +2145,6 @@ 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->remove_folder(item->folder, item) < 0) {
-               alertpanel_error(_("Can't remove the folder `%s'."), name);
-               if (folderview->opened == folderview->selected)
-                       summary_show(folderview->summaryview,
-                                    folderview->summaryview->folder_item);
-               g_free(old_id);
-               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,
@@ -2195,7 +2153,15 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
                folderview->opened = NULL;
        }
 
-       gtk_ctree_remove_node(ctree, folderview->selected);
+       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,
+                                    folderview->summaryview->folder_item);
+               g_free(old_id);
+               return;
+       }
+
        folder_write_list();
 
        prefs_filtering_delete_path(old_id);
@@ -2231,10 +2197,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();
 }
 
@@ -2253,7 +2220,7 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_IMAP);
+       g_return_if_fail(FOLDER_TYPE(item->folder) == F_IMAP);
        g_return_if_fail(item->folder->account != NULL);
 
        new_folder = input_dialog
@@ -2291,8 +2258,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();
 }
 
@@ -2311,7 +2276,7 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_IMAP);
+       g_return_if_fail(FOLDER_TYPE(item->folder) == F_IMAP);
        g_return_if_fail(item->folder->account != NULL);
 
        name_ = trim_string(item->folder->name, 32);
@@ -2361,7 +2326,7 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        folder = item->folder;
        g_return_if_fail(folder != NULL);
-       g_return_if_fail(folder->type == F_NEWS);
+       g_return_if_fail(FOLDER_TYPE(folder) == F_NEWS);
        g_return_if_fail(folder->account != NULL);
 
        if (GTK_CTREE_ROW(folderview->selected)->parent != NULL)
@@ -2446,7 +2411,7 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_NEWS);
+       g_return_if_fail(FOLDER_TYPE(item->folder) == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
        name_ = trim_string(item->path, 32);
@@ -2485,7 +2450,7 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_NEWS);
+       g_return_if_fail(FOLDER_TYPE(item->folder) == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
        name_ = trim_string(item->folder->name, 32);
@@ -2536,8 +2501,7 @@ 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_create(folderview, item);
+               prefs_folder_item_open(item);
        }
 }
 
@@ -2561,18 +2525,30 @@ 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;
 
        if (folderview->selected)
                from_folder = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree), folderview->selected);
-       if (!from_folder || from_folder->folder->type == F_NEWS)
+       if (!from_folder || FOLDER_TYPE(from_folder->folder) == F_NEWS)
                return;
 
        to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL);
        
-       if (!to_folder || to_folder->folder->type == F_NEWS)
+       if (!to_folder || FOLDER_TYPE(to_folder->folder) == F_NEWS)
                return;
 
        folderview_move_to(folderview, from_folder, to_folder);
@@ -2599,16 +2575,14 @@ 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);
-               if (src_node)
-                       gtk_ctree_remove_node(GTK_CTREE(folderview->ctree), src_node);
-               else 
-                       debug_print("can't remove src node: is null\n");
+               folder_item_update_thaw();
+               folder_item_update_recursive(new_folder, F_ITEM_UPDATE_MSGCNT);
 
-               folderview_create_folder_node_recursive(folderview, new_folder);
                folderview_sort_folders(folderview, 
                        gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), 
                                NULL, new_folder->parent), new_folder->folder);
@@ -2617,6 +2591,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."));
@@ -2636,6 +2611,191 @@ 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_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;
+}
+
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -2644,7 +2804,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;
@@ -2667,7 +2827,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
 
                if (item && item->folder && item->path &&
                    src_item && src_item != item) {
-                       switch (item->folder->type) {
+                       switch (FOLDER_TYPE(item->folder)) {
                        case F_MH:
                        case F_MBOX:
                        case F_IMAP:
@@ -2679,30 +2839,23 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                } else if (item && item->folder && folder_item_get_path(item) &&
                           src_item && src_item != item) {
                        /* a root folder - acceptable only from folderview */
-                       if (item->folder->type == F_MH || item->folder->type == F_IMAP)
+                       if (FOLDER_TYPE(item->folder) == F_MH || FOLDER_TYPE(item->folder) == F_IMAP)
                                acceptable = TRUE;
                }
                        
        }
 
-       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),
-                        GTK_SIGNAL_FUNC(folderview_selected), folderview);
+               g_signal_handlers_block_by_func
+                       (G_OBJECT(widget),
+                        G_CALLBACK(folderview_selected), folderview);
                gtk_ctree_select(GTK_CTREE(widget), node);
-               gtk_signal_handler_unblock_by_func
-                       (GTK_OBJECT(widget),
-                        GTK_SIGNAL_FUNC(folderview_selected), folderview);
+               g_signal_handlers_unblock_by_func
+                       (G_OBJECT(widget),
+                        G_CALLBACK(folderview_selected), folderview);
                gdk_drag_status(context, 
                                        (context->actions == GDK_ACTION_COPY ?
                                        GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
@@ -2719,6 +2872,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);
 }
 
@@ -2735,6 +2889,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
@@ -2748,7 +2903,7 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                /* re-check (due to acceptable possibly set for folder moves */
                if (!(item && item->folder && item->path &&
                      src_item && src_item != item && 
-                     (item->folder->type == F_MH || item->folder->type == F_IMAP))) {
+                     (FOLDER_TYPE(item->folder) == F_MH || FOLDER_TYPE(item->folder) == F_IMAP))) {
                        return;
                }
                if (item && src_item) {
@@ -2760,8 +2915,8 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                                case GDK_ACTION_MOVE:
                                case GDK_ACTION_DEFAULT:
                                default:
-                       if (src_item->folder->type != item->folder->type ||
-                           (item->folder->type == F_IMAP &&
+                       if (FOLDER_TYPE(src_item->folder) != FOLDER_TYPE(item->folder) ||
+                           (FOLDER_TYPE(item->folder) == F_IMAP &&
                             src_item->folder != item->folder))
                                summary_copy_selected_to(folderview->summaryview, item);
                        else
@@ -2796,130 +2951,11 @@ 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) 
-{
-       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)
+static void folderview_drag_end_cb(GtkWidget       *widget, 
+                                  GdkDragContext   *drag_context,
+                                   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;
 }
-