2005-01-24 [colin] 1.0.0cvs10.1
[claws.git] / src / folderview.c
index f4183c354d5739a2c75d096e0cce5b2a7c469e42..dd440f02e7766e98480dc9f6de07a3cbc31d7d06 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,7 +44,6 @@
 #include "summaryview.h"
 #include "summary_search.h"
 #include "inputdialog.h"
-#include "grouplistdialog.h"
 #include "manage_window.h"
 #include "alertpanel.h"
 #include "menu.h"
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "prefs_filtering.h"
-#include "prefs_scoring.h"
 #include "prefs_folder_item.h"
 #include "account.h"
 #include "folder.h"
+#include "foldersel.h"
 #include "inc.h"
 #include "statusbar.h"
+#include "hooks.h"
+#include "folderutils.h"
+#include "partial_download.h"
 
 typedef enum
 {
@@ -76,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;
@@ -129,6 +128,12 @@ static GdkPixmap *newxpm;
 static GdkBitmap *newxpmmask;
 static GdkPixmap *unreadxpm;
 static GdkBitmap *unreadxpmmask;
+static GdkPixmap *readxpm;
+static GdkBitmap *readxpmmask;
+static GdkPixmap *draftsxpm;
+static GdkBitmap *draftsxpmmask;
+static GdkPixmap *draftsopenxpm;
+static GdkBitmap *draftsopenxpmmask;
 
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
@@ -141,24 +146,18 @@ static void folderview_append_folder       (FolderView    *folderview,
 static void folderview_update_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
 
-static GtkCTreeNode *folderview_find_by_name   (GtkCTree       *ctree,
-                                                GtkCTreeNode   *node,
-                                                const gchar    *name);
-
 static gint folderview_clist_compare   (GtkCList       *clist,
                                         gconstpointer   ptr1,
                                         gconstpointer   ptr2);
-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,
@@ -178,46 +177,11 @@ static void folderview_col_resized        (GtkCList       *clist,
                                         gint            width,
                                         FolderView     *folderview);
 
-static void folderview_update_tree_cb  (FolderView     *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
 static void mark_all_read_cb            (FolderView    *folderview,
                                          guint           action,
                                          GtkWidget      *widget);
-static void folderview_new_folder_cb   (FolderView     *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void folderview_new_mbox_folder_cb(FolderView *folderview,
-                                         guint action,
-                                         GtkWidget *widget);
-static void folderview_rename_folder_cb        (FolderView     *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void folderview_rename_mbox_folder_cb(FolderView *folderview,
-                                            guint action,
-                                            GtkWidget *widget);
-static void folderview_delete_folder_cb        (FolderView     *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void folderview_remove_mailbox_cb(FolderView    *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void folderview_new_imap_folder_cb(FolderView   *folderview,
-                                         guint          action,
-                                         GtkWidget     *widget);
-static void folderview_rm_imap_server_cb (FolderView   *folderview,
-                                         guint          action,
-                                         GtkWidget     *widget);
 
-static void folderview_new_news_group_cb(FolderView    *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void folderview_rm_news_group_cb        (FolderView     *folderview,
-                                        guint           action,
-                                        GtkWidget      *widget);
-static void folderview_rm_news_server_cb(FolderView    *folderview,
+static void folderview_empty_trash_cb  (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
@@ -255,86 +219,98 @@ 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);
-void folderview_update_item             (FolderItem       *item,
-                                          gboolean         update_summary,
-                                         gpointer          data);
-
-static void folderview_scoring_cb(FolderView *folderview, guint action,
-                                 GtkWidget *widget);
+gboolean folderview_update_folder       (gpointer          source,
+                                         gpointer          userdata);
+gboolean folderview_update_item_claws   (gpointer          source,
+                                         gpointer          data);
 static void folderview_processing_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget);
-static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
-{
-       {N_("/Create _new folder..."),  NULL, folderview_new_mbox_folder_cb,    0, NULL},
-       {N_("/_Rename folder..."),      NULL, folderview_rename_mbox_folder_cb, 0, NULL},
-       {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Properties..."),         NULL, NULL, 0, NULL},
-       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
-       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
-};
 
-static GtkItemFactoryEntry folderview_mail_popup_entries[] =
+GHashTable *folderview_popups;
+
+static GtkItemFactoryEntry folderview_common_popup_entries[] =
 {
        {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/Create _new folder..."),  NULL, folderview_new_folder_cb,    0, NULL},
-       {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb, 0, NULL},
-       {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Check for new messages"),
-                                       NULL, folderview_update_tree_cb, 0, NULL},
-       {N_("/R_ebuild folder tree"),   NULL, folderview_update_tree_cb, 1, NULL},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
        {N_("/_Properties..."),         NULL, folderview_property_cb, 0, NULL},
-       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
-       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
+       {N_("/Pr_ocessing..."),         NULL, folderview_processing_cb, 0, NULL},
 };
 
-static GtkItemFactoryEntry folderview_imap_popup_entries[] =
-{
-       {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/Create _new folder..."),  NULL, folderview_new_imap_folder_cb, 0, NULL},
-       {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb,   0, NULL},
-       {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb,   0, NULL},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Check for new messages"),
-                                       NULL, folderview_update_tree_cb, 0, NULL},
-       {N_("/R_ebuild folder tree"),   NULL, folderview_update_tree_cb, 1, NULL},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/Remove _IMAP4 account"),  NULL, folderview_rm_imap_server_cb, 0, NULL},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
-       {N_("/_Properties..."),         NULL, folderview_property_cb, 0, NULL},
-       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
-       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
+static GtkItemFactoryEntry folder_view_trash_popup_entries[] = {
+       {N_("/------"),                 NULL, NULL, 0, "<Separator>"},
+       {N_("/Empty trash..."),         NULL, folderview_empty_trash_cb, 0, NULL},
 };
 
-static GtkItemFactoryEntry folderview_news_popup_entries[] =
+
+GtkTargetEntry folderview_drag_types[] =
 {
-       {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Subscribe to newsgroup..."),
-                                        NULL, folderview_new_news_group_cb, 0, NULL},
-       {N_("/_Remove newsgroup"),       NULL, folderview_rm_news_group_cb, 0, NULL},
-       {N_("/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/Remove _news account"),    NULL, folderview_rm_news_server_cb, 0, NULL},
-       {N_("/---"),                     NULL, NULL, 0, "<Separator>"},
-       {N_("/_Search folder..."),       NULL, folderview_search_cb, 0, NULL},
-       {N_("/_Properties..."),          NULL, folderview_property_cb, 0, NULL},
-       {N_("/_Processing..."),          NULL, folderview_processing_cb, 0, NULL},
-       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
+       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
 };
 
+void folderview_initialize(void)
+{
+       FolderViewPopup *fpopup;
+       guint i, n_entries;
+       GSList *entries = NULL;
+
+       fpopup = g_new0(FolderViewPopup, 1);
+
+       n_entries = sizeof(folderview_common_popup_entries) /
+               sizeof(folderview_common_popup_entries[0]);
+       for (i = 0; i < n_entries; i++)
+               entries = g_slist_append(entries, &folderview_common_popup_entries[i]);
+
+       fpopup->klass = "common";
+       fpopup->path = "<CommonFolder>";
+       fpopup->entries = entries;
+       fpopup->set_sensitivity = NULL;
+
+       folderview_popups = g_hash_table_new(g_str_hash, g_str_equal);
+       g_hash_table_insert(folderview_popups, "common", fpopup);
+}
+
+static GtkItemFactory *create_ifactory(FolderView *folderview, FolderViewPopup *fpopup)
+{
+       GSList *entries;
+       GtkItemFactory *factory;
+       FolderViewPopup *fpopup_common;
+       GtkWidget *popup;
+
+       factory = gtk_item_factory_new(GTK_TYPE_MENU, fpopup->path, NULL);
+       gtk_item_factory_set_translate_func(factory, menu_translate,
+                                           NULL, NULL);
+
+       for (entries = fpopup->entries; entries != NULL; entries = g_slist_next(entries))
+               gtk_item_factory_create_item(factory, entries->data, folderview, 1);
+
+       fpopup_common = g_hash_table_lookup(folderview_popups, "common");
+       if (fpopup_common != fpopup)
+               for (entries = fpopup_common->entries; entries != NULL; entries = g_slist_next(entries))
+                       gtk_item_factory_create_item(factory, entries->data, folderview, 1);
+
+       popup = gtk_item_factory_get_widget(factory, fpopup->path);
+        g_signal_connect(G_OBJECT(popup), "selection_done",
+                         G_CALLBACK(folderview_popup_close),
+                         folderview);
+
+       return factory;
+}
+
+static void create_ifactories(gpointer key, gpointer value, gpointer data)
+{
+       FolderView *folderview = data;
+       FolderViewPopup *fpopup = value;
+       GtkItemFactory *factory;
+
+       factory = create_ifactory(folderview, fpopup);
+       g_hash_table_insert(folderview->popups, fpopup->klass, factory);
+}
 
 FolderView *folderview_create(void)
 {
@@ -342,15 +318,6 @@ FolderView *folderview_create(void)
        GtkWidget *scrolledwin;
        GtkWidget *ctree;
        gchar *titles[N_FOLDER_COLS];
-       GtkWidget *mail_popup;
-       GtkWidget *news_popup;
-       GtkWidget *imap_popup;
-       GtkWidget *mbox_popup;
-       GtkItemFactory *mail_factory;
-       GtkItemFactory *news_factory;
-       GtkItemFactory *imap_factory;
-       GtkItemFactory *mbox_factory;
-       gint n_entries;
        gint i;
 
        debug_print("Creating folder view...\n");
@@ -366,7 +333,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);
 
@@ -374,12 +341,10 @@ FolderView *folderview_create(void)
        
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
-#ifndef CLAWS /* text instead of pixmaps */
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_NEW,
                                           GTK_JUSTIFY_RIGHT);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_UNREAD,
                                           GTK_JUSTIFY_RIGHT);
-#endif                                    
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_TOTAL,
                                           GTK_JUSTIFY_RIGHT);
        gtk_clist_set_column_width(GTK_CLIST(ctree), COL_FOLDER,
@@ -396,109 +361,72 @@ FolderView *folderview_create(void)
        gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
        gtk_clist_set_compare_func(GTK_CLIST(ctree), folderview_clist_compare);
 
+       /* create popup factories */
+       folderview->popups = g_hash_table_new(g_str_hash, g_str_equal);
+       g_hash_table_foreach(folderview_popups, create_ifactories, folderview);
+
        /* don't let title buttons take key focus */
        for (i = 0; i < N_FOLDER_COLS; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
                                       GTK_CAN_FOCUS);
 
-       /* popup menu */
-       n_entries = sizeof(folderview_mail_popup_entries) /
-               sizeof(folderview_mail_popup_entries[0]);
-       mail_popup = menu_create_items(folderview_mail_popup_entries,
-                                      n_entries,
-                                      "<MailFolder>", &mail_factory,
-                                      folderview);
-       n_entries = sizeof(folderview_imap_popup_entries) /
-               sizeof(folderview_imap_popup_entries[0]);
-       imap_popup = menu_create_items(folderview_imap_popup_entries,
-                                      n_entries,
-                                      "<IMAPFolder>", &imap_factory,
-                                      folderview);
-       n_entries = sizeof(folderview_news_popup_entries) /
-               sizeof(folderview_news_popup_entries[0]);
-       news_popup = menu_create_items(folderview_news_popup_entries,
-                                      n_entries,
-                                      "<NewsFolder>", &news_factory,
-                                      folderview);
-       n_entries = sizeof(folderview_mbox_popup_entries) /
-               sizeof(folderview_mbox_popup_entries[0]);
-       mbox_popup = menu_create_items(folderview_mbox_popup_entries,
-                                      n_entries,
-                                      "<MailFolder>", &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);
 
         /* 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;
-       folderview->mail_popup   = mail_popup;
-       folderview->mail_factory = mail_factory;
-       folderview->imap_popup   = imap_popup;
-       folderview->imap_factory = imap_factory;
-       folderview->news_popup   = news_popup;
-       folderview->news_factory = news_factory;
-       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 =
-               folder_item_update_callback_register(folderview_update_item, (gpointer) folderview);
+               hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item_claws, (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;
@@ -509,9 +437,12 @@ void folderview_init(FolderView *folderview)
        GtkWidget *ctree = folderview->ctree;
        GtkWidget *label_new;
        GtkWidget *label_unread;
+       GtkWidget *label_total;
        GtkWidget *hbox_new;
        GtkWidget *hbox_unread;
-
+       GtkWidget *hbox_total;
+               
+       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);
@@ -532,6 +463,8 @@ void folderview_init(FolderView *folderview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM, &queuehrmxpm, &queuehrmxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN, &queueopenxpm, &queueopenxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM, &queueopenhrmxpm, &queueopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_CLOSE, &draftsxpm, &draftsxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_OPEN, &draftsopenxpm, &draftsopenxpmmask);
 
        /* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
         * instead text (text overflows making them unreadable and ugly) */
@@ -539,45 +472,65 @@ void folderview_init(FolderView *folderview)
                         &newxpm, &newxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD,
                         &unreadxpm, &unreadxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_READ,
+                        &readxpm, &readxpmmask);
                
        label_new = gtk_pixmap_new(newxpm, newxpmmask);
        label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
+       label_total = gtk_pixmap_new(readxpm, readxpmmask);
 
        hbox_new = gtk_hbox_new(FALSE, 4);
        hbox_unread = gtk_hbox_new(FALSE, 4);
+       hbox_total = gtk_hbox_new(FALSE, 4);
 
        /* left justified */
-       gtk_box_pack_start(GTK_BOX(hbox_new),label_new,FALSE,FALSE,0);
-       gtk_box_pack_start(GTK_BOX(hbox_unread),label_unread,FALSE,FALSE,0);
+       gtk_box_pack_start(GTK_BOX(hbox_new), label_new, TRUE, TRUE, 0);
+       gtk_misc_set_alignment (GTK_MISC (label_new), 1, 0.5);
+       gtk_box_pack_start(GTK_BOX(hbox_unread), label_unread, TRUE, TRUE, 0);
+       gtk_misc_set_alignment (GTK_MISC (label_unread), 1, 0.5);
+       gtk_box_pack_start(GTK_BOX(hbox_total), label_total, TRUE, TRUE, 0);
+       gtk_misc_set_alignment (GTK_MISC (label_total), 1, 0.5);
 
        gtk_widget_show_all(hbox_new);
        gtk_widget_show_all(hbox_unread);
+       gtk_widget_show_all(hbox_total);
 
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
+       gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_TOTAL,hbox_total);
                        
+       if (!normal_style) {
+               PangoFontDescription *font_desc;
+               normal_style = gtk_style_copy(gtk_widget_get_style(ctree));
+               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;
 
-
-       if (!normalfont)
-               normalfont = gtkut_font_load(NORMAL_FONT);
-       if (!boldfont)
-               boldfont = gtkut_font_load(BOLD_FONT);
+               gtk_widget_set_style(ctree, normal_style);
+       }
 
        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(prefs_common.boldfont);
+               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;
 
                bold_tgtfold_style = gtk_style_copy(bold_style);
                bold_tgtfold_style->fg[GTK_STATE_NORMAL] = folderview->color_op;
        }
-       if (!normal_style) {
-               normal_style = gtk_style_copy(gtk_widget_get_style(ctree));
-               normal_style->font = normalfont;
-               normal_color_style = gtk_style_copy(normal_style);
-               normal_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
-       }
 }
 
 void folderview_set(FolderView *folderview)
@@ -631,8 +584,13 @@ void folderview_select(FolderView *folderview, FolderItem *item)
 static void mark_all_read_cb(FolderView *folderview, guint action,
                              GtkWidget *widget)
 {
-       if (folderview->selected)
-               summary_mark_all_read(folderview->summaryview);
+       FolderItem *item;
+
+       item = folderview_get_selected_item(folderview);
+       if (item == NULL)
+               return;
+
+       folderutils_mark_all_read(item);
 }
 
 static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
@@ -644,7 +602,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);
@@ -673,7 +632,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;
        }
 
@@ -699,6 +658,14 @@ void folderview_select_next_unread(FolderView *folderview)
                folderview_select_node(folderview, node);
 }
 
+FolderItem *folderview_get_selected_item(FolderView *folderview)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+
+       if (!folderview->selected) return NULL;
+       return gtk_ctree_node_get_row_data(ctree, folderview->selected);
+}
+
 void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -719,24 +686,53 @@ 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);
 }
 
+void folderview_append_item(FolderItem *item)
+{
+       GList *list;
+
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+       if (folder_item_parent(item)) return;
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               FolderView *folderview = (FolderView *)list->data;
+               GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+               GtkCTreeNode *node, *child;
+
+               node = gtk_ctree_find_by_row_data(ctree, NULL, 
+                                                 folder_item_parent(item));
+               if (node) {
+                       child = gtk_ctree_find_by_row_data(ctree, node, item);
+                       if (!child) {
+                               gchar *text[N_FOLDER_COLS] =
+                                       {NULL, "0", "0", "0"};
+
+                               gtk_clist_freeze(GTK_CLIST(ctree));
+
+                               text[COL_FOLDER] = item->name;
+                               child = gtk_ctree_insert_node
+                                       (ctree, node, NULL, text,
+                                        FOLDER_SPACING,
+                                        folderxpm, folderxpmmask,
+                                        folderopenxpm, folderopenxpmmask,
+                                        FALSE, FALSE);
+                               gtk_ctree_node_set_row_data(ctree, child, item);
+                               gtk_ctree_expand(ctree, node);
+                               folderview_update_node(folderview, child);
+                               folderview_sort_folders(folderview, node,
+                                                       item->folder);
+
+                               gtk_clist_thaw(GTK_CLIST(ctree));
+                       }
+               }
+       }
+}
+
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
@@ -751,15 +747,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
-               return;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                FolderView *folderview = (FolderView *)list->data;
@@ -768,11 +755,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);
@@ -785,13 +772,13 @@ 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);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-       gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
+       gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
        manage_window_set_transient(GTK_WINDOW(window));
 
        label = gtk_label_new(str);
@@ -809,7 +796,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..."));
@@ -820,53 +807,26 @@ 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
 
-void folderview_check_new(Folder *folder)
+/** folderview_check_new()
+ *  Scan and update the folder and return the 
+ *  count the number of new messages since last check. 
+ *  \param folder the folder to check for new messages
+ *  \return the number of new messages since last check
+ */
+gint folderview_check_new(Folder *folder)
 {
        GList *list;
        FolderItem *item;
        FolderView *folderview;
        GtkCTree *ctree;
        GtkCTreeNode *node;
+       gint new_msgs = 0;
+       gint former_new_msgs = 0;
+       gint former_new = 0;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                folderview = (FolderView *)list->data;
@@ -883,13 +843,17 @@ void folderview_check_new(Folder *folder)
                        if (item->no_select) continue;
                        if (folder && folder != item->folder) continue;
                        if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
+                       if (!item->prefs->newmailcheck) continue;
 
                        folderview_scan_tree_func(item->folder, item, NULL);
+                       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_msgs;
+                       former_new_msgs += former_new;
                }
 
                gtk_widget_set_sensitive(folderview->ctree, TRUE);
@@ -898,6 +862,13 @@ void folderview_check_new(Folder *folder)
        }
 
        folder_write_list();
+       /* Number of new messages since last check is the just the difference 
+        * between former_new_msgs and new_msgs. If new_msgs is less than
+        * former_new_msgs, that would mean another session accessed the folder
+        * and the result is not well defined.
+        */
+       new_msgs = (former_new_msgs < new_msgs ? new_msgs - former_new_msgs : 0);
+       return new_msgs;
 }
 
 void folderview_check_new_all(void)
@@ -936,8 +907,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;
@@ -982,8 +953,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;
@@ -1020,6 +991,51 @@ static gboolean folderview_have_unread_children(FolderView *folderview,
        return FALSE;
 }
 
+static gboolean folderview_search_matching_recursive(GtkCTree *ctree,
+                                                  GtkCTreeNode *node)
+{
+       FolderItem *item;
+
+       if (node) {
+               item = gtk_ctree_node_get_row_data(ctree, node);
+               if (item) {
+                       if (item->search_match)
+                               return TRUE;
+               }
+               node = GTK_CTREE_ROW(node)->children;
+       } else
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       while (node) {
+               if (folderview_search_matching_recursive(ctree, node) == TRUE)
+                       return TRUE;
+               node = GTK_CTREE_ROW(node)->sibling;
+       }
+
+       return FALSE;
+}
+
+static gboolean folderview_have_matching_children(FolderView *folderview,
+                                               GtkCTreeNode *node)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+
+       if (!node)
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       if (!node)
+               return FALSE;
+
+       node = GTK_CTREE_ROW(node)->children;
+
+       while (node) {
+               if (folderview_search_matching_recursive(ctree, node) == TRUE)
+                       return TRUE;
+               node = GTK_CTREE_ROW(node)->sibling;
+       }
+
+       return FALSE;
+}
+
 static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -1028,9 +1044,13 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
        GdkBitmap *mask, *openmask;
+       static GdkPixmap *searchicon;
+       static GdkBitmap *searchmask;
+
        gchar *name;
        gchar *str;
        gboolean add_unread_mark;
+       gboolean add_sub_match_mark;
        gboolean use_bold, use_color;
 
        item = gtk_ctree_node_get_row_data(ctree, node);
@@ -1049,9 +1069,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) {
@@ -1065,9 +1082,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) {
@@ -1081,9 +1095,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) {
@@ -1097,23 +1108,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 = folderxpm;
-               mask = folderxpmmask;
-               if (item->hide_read_msgs) {
-                       openxpm = folderopenhrmxpm;
-                       openmask = folderopenhrmxpmmask;
-               } else {
-                       openxpm = folderopenxpm;
-                       openmask = folderopenxpmmask;
-               }
-               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
-                               !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
-                               item->name);
+               xpm = draftsxpm;
+               mask = draftsxpmmask;
+               openxpm = draftsopenxpm;
+               openmask = draftsopenxpmmask;
                break;
        default:
                if (item->hide_read_msgs) {
@@ -1127,52 +1127,44 @@ 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) &&
-                           prefs_common.ng_abbrev_len < strlen(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))
-               add_unread_mark = TRUE;
-       else
+       if (!GTK_CTREE_ROW(node)->expanded) {
+               add_unread_mark = folderview_have_unread_children(
+                                       folderview, node);
+               add_sub_match_mark = folderview_have_matching_children(
+                                       folderview, node);
+       } else {
                add_unread_mark = FALSE;
+               add_sub_match_mark = FALSE;
+       }
 
-       if (item->stype == F_QUEUE && item->total > 0 &&
+       if (item->search_match) {
+               if (!searchicon) {
+                       stock_pixmap_gdk(folderview->ctree, STOCK_PIXMAP_QUICKSEARCH,
+                        &searchicon, &searchmask);
+               }
+               xpm = openxpm = searchicon;
+               mask = openmask = searchmask;
+       }
+
+       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) &&
-                prefs_common.display_folder_unread) {
-
-               if (item->unread > 0)
-                       str = g_strdup_printf("%s (%d%s%s)", name, item->unread,
-                                             add_unread_mark ? "+" : "", 
-                                             item->unreadmarked > 0 ? "!":"");
+       } else if (((item->unread_msgs > 0 || add_unread_mark) &&
+                   prefs_common.display_folder_unread) 
+                  || add_sub_match_mark) {
+
+               if (item->unread_msgs > 0)
+                       str = g_strdup_printf("%s (%d%s%s)", name, item->unread_msgs,
+                                             add_unread_mark || add_sub_match_mark ? "+" : "", 
+                                             item->unreadmarked_msgs > 0 ? "!":"");
                else
                        str = g_strdup_printf("%s (+)", name);
                gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
@@ -1181,7 +1173,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,
@@ -1190,14 +1182,14 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        }
        g_free(name);
 
-       if (!item->parent) {
+       if (!folder_item_parent(item)) {
                gtk_ctree_node_set_text(ctree, node, COL_NEW,    "-");
                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 ||
@@ -1205,23 +1197,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;
                }
@@ -1244,29 +1244,98 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        gtk_ctree_node_set_row_style(ctree, node, style);
 
-       item->need_update = FALSE;
-
        if ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
                folderview_update_node(folderview, node);
 }
 
-void folderview_update_item(FolderItem *item, gboolean update_summary, gpointer data)
+#if !CLAWS /* keep it here for syncs */
+void folderview_update_item(FolderItem *item, gboolean update_summary)
 {
-       FolderView *folderview = (FolderView *)data;
+       GList *list;
+       FolderView *folderview;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+
+       g_return_if_fail(item != NULL);
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
+
+               node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+               if (node) {
+                       folderview_update_node(folderview, node);
+                       if (update_summary && folderview->opened == node)
+                               summary_show(folderview->summaryview,
+                                            item, FALSE);
+               }
+       }
+}
+#endif
+
+void folderview_update_search_icon(FolderItem *item, gboolean matches)
+{
+       GList *list;
+       FolderView *folderview;
        GtkCTree *ctree;
        GtkCTreeNode *node;
 
-       g_return_if_fail(folderview != NULL);
        g_return_if_fail(item != NULL);
 
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
+
+               node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+               if (node) {
+                       item->search_match = matches;
+                       folderview_update_node(folderview, node);
+               }
+       }
+}
+
+gboolean folderview_update_item_claws(gpointer source, gpointer data)
+{
+       FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
+       FolderView *folderview = (FolderView *)data;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+
+       g_return_val_if_fail(update_info != NULL, TRUE);
+       g_return_val_if_fail(update_info->item != NULL, TRUE);
+       g_return_val_if_fail(folderview != NULL, FALSE);
+
        ctree = GTK_CTREE(folderview->ctree);
 
-       node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+       node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
        if (node) {
-               folderview_update_node(folderview, node);
-               if (update_summary && folderview->opened == node)
-                       summary_show(folderview->summaryview, item);
+               if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
+                       folderview_update_node(folderview, node);
+               if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
+                       summary_show(folderview->summaryview, update_info->item);
        }
+       
+       return FALSE;
+}
+
+static void folderview_update_item_foreach_func(gpointer key, gpointer val,
+                                               gpointer data)
+{
+       /* CLAWS: share this joy with other hook functions ... */
+       folder_item_update((FolderItem *)key, 
+                          (FolderItemUpdateFlags)GPOINTER_TO_INT(data));
+}
+
+void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
+{
+       GList *list;
+       FolderItemUpdateFlags flags;
+       
+       flags = update_summary ?  F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_MSGCNT
+               : 0;
+       for (list = folderview_list; list != NULL; list = list->next)
+               g_hash_table_foreach(table, folderview_update_item_foreach_func, 
+                                    GINT_TO_POINTER(flags));
 }
 
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
@@ -1301,26 +1370,37 @@ static void folderview_expand_func(GtkCTree *ctree, GtkCTreeNode *node,
        }
 }
 
-#define SET_SPECIAL_FOLDER(ctree, item) \
-{ \
-       if (item) { \
-               GtkCTreeNode *node, *parent, *sibling; \
- \
-               node = gtk_ctree_find_by_row_data(ctree, root, item); \
-               if (!node) \
-                       g_warning("%s not found.\n", item->path); \
-               else { \
-                       parent = GTK_CTREE_ROW(node)->parent; \
-                       if (prev && parent == GTK_CTREE_ROW(prev)->parent) \
-                               sibling = GTK_CTREE_ROW(prev)->sibling; \
-                       else \
-                               sibling = GTK_CTREE_ROW(parent)->children; \
-                       if (node != sibling) \
-                               gtk_ctree_move(ctree, node, parent, sibling); \
-               } \
- \
-               prev = node; \
-       } \
+static void set_special_folder(GtkCTree *ctree, FolderItem *item,
+                              GtkCTreeNode *root, GtkCTreeNode **prev)
+{
+       if (item) {
+               GtkCTreeNode *node, *parent, *sibling;
+
+               node = gtk_ctree_find_by_row_data(ctree, root, item);
+               if (!node)
+                       g_warning("%s not found.\n", item->path);
+               else {
+                       parent = GTK_CTREE_ROW(node)->parent;
+                       if (*prev && parent == GTK_CTREE_ROW(*prev)->parent)
+                               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);
+               }
+
+               *prev = node;
+       }
 }
 
 static void folderview_sort_folders(FolderView *folderview, GtkCTreeNode *root,
@@ -1331,13 +1411,13 @@ 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);
-       SET_SPECIAL_FOLDER(ctree, folder->draft);
-       SET_SPECIAL_FOLDER(ctree, folder->queue);
-       SET_SPECIAL_FOLDER(ctree, folder->trash);
+       set_special_folder(ctree, folder->inbox, root, &prev);
+       set_special_folder(ctree, folder->outbox, root, &prev);
+       set_special_folder(ctree, folder->draft, root, &prev);
+       set_special_folder(ctree, folder->queue, root, &prev);
+       set_special_folder(ctree, folder->trash, root, &prev);
 }
 
 static void folderview_append_folder(FolderView *folderview, Folder *folder)
@@ -1354,115 +1434,24 @@ static void folderview_append_folder(FolderView *folderview, Folder *folder)
        folderview_sort_folders(folderview, root, folder);
 }
 
-void folderview_new_folder(FolderView *folderview)
+/* callback functions */
+
+static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
+                                         FolderView *folderview)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCList *clist = GTK_CLIST(ctree);
+       gint prev_row = -1, row = -1, column = -1;
        FolderItem *item;
+       Folder *folder;
+       FolderViewPopup *fpopup;
+       GtkItemFactory *fpopup_factory;
+       GtkWidget *popup;
 
-       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);
-
-       switch (item->folder->type) {
-       case F_MBOX:
-               folderview_new_mbox_folder_cb(folderview, 0, NULL);
-               break;
-       case F_MH:
-       case F_MAILDIR:
-               folderview_new_folder_cb(folderview, 0, NULL);
-               break;
-       case F_IMAP:
-               folderview_new_imap_folder_cb(folderview, 0, NULL);
-               break;
-       case F_NEWS:
-       default:
-               break;
-       }
-}
-
-void folderview_rename_folder(FolderView *folderview)
-{
-       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);
-       if (!item->path) return;
-       if (item->stype != F_NORMAL) return;
-
-       switch (item->folder->type) {
-       case F_MBOX:
-               folderview_rename_mbox_folder_cb(folderview, 0, NULL);
-       case F_MH:
-       case F_MAILDIR:
-       case F_IMAP:
-               folderview_rename_folder_cb(folderview, 0, NULL);
-               break;
-       case F_NEWS:
-       default:
-               break;
-       }
-}
-
-void folderview_delete_folder(FolderView *folderview)
-{
-       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);
-       if (!item->path) return;
-       if (item->stype != F_NORMAL) return;
-
-       switch (item->folder->type) {
-       case F_MH:
-       case F_MBOX:
-       case F_MAILDIR:
-       case F_IMAP:
-               folderview_delete_folder_cb(folderview, 0, NULL);
-               break;
-       case F_NEWS:
-       default:
-               break;
-       }
-}
-
-
-/* callback functions */
-
-static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
-                                     FolderView *folderview)
-{
-       GtkCList *clist = GTK_CLIST(ctree);
-       gint prev_row = -1, row = -1, column = -1;
-       FolderItem *item;
-       Folder *folder;
-       GtkWidget *popup;
-       gboolean mark_all_read   = FALSE;
-       gboolean new_folder      = FALSE;
-       gboolean rename_folder   = FALSE;
-       gboolean delete_folder   = FALSE;
-       gboolean update_tree     = FALSE;
-       gboolean rescan_tree     = FALSE;
-       gboolean remove_tree     = FALSE;
-       gboolean search_folder   = FALSE;
-       gboolean folder_property = FALSE;
-       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) {
@@ -1478,7 +1467,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)
@@ -1491,111 +1480,56 @@ 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) {
-               new_folder = TRUE;
-               if (item->parent == NULL) {
-                       update_tree = remove_tree = TRUE;
-                       if (folder->account)
-                               folder_property = TRUE;
-               } else
-                       mark_all_read = search_folder = folder_property = TRUE;
-                       
-               if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP || FOLDER_TYPE(folder) == F_MBOX) {
-                       if (item->parent == NULL)
-                               update_tree = rescan_tree = TRUE;
-                       else if (item->stype == F_NORMAL)
-                               rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
-                       else if (item->stype == F_INBOX)
-                               folder_scoring = folder_processing = TRUE;
-                       else if (item->stype == F_TRASH)
-                               folder_processing = TRUE;
-                       else if (item->stype == F_OUTBOX)
-                               folder_processing = TRUE;
-               } else if (FOLDER_TYPE(folder) == F_NEWS) {
-                       if (item->parent != NULL)
-                               delete_folder = folder_scoring = folder_processing = TRUE;
-               }
-               if (item->unread < 1) 
-                       mark_all_read = FALSE;
+       fpopup = g_hash_table_lookup(folderview_popups, folder->klass->idstr);
+       if (fpopup != NULL)
+               fpopup_factory = g_hash_table_lookup(folderview->popups, folder->klass->idstr);
+       else {
+               fpopup = g_hash_table_lookup(folderview_popups, "common");
+               fpopup_factory = g_hash_table_lookup(folderview->popups, "common");
        }
 
-#define SET_SENS(factory, name, sens) \
-       menu_set_sensitive(folderview->factory, name, sens)
-       
-       mark_all_read = mark_all_read && 
-                       (item == folderview->summaryview->folder_item);
-
-       if (FOLDER_IS_LOCAL(folder)) {
-               popup = folderview->mail_popup;
-               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
-               SET_SENS(mail_factory, "/Mark all read", mark_all_read);
-               SET_SENS(mail_factory, "/Create new folder...", new_folder);
-               SET_SENS(mail_factory, "/Rename folder...", rename_folder);
-               SET_SENS(mail_factory, "/Delete folder", delete_folder);
-               SET_SENS(mail_factory, "/Check for new messages", update_tree);
-               SET_SENS(mail_factory, "/Rebuild folder tree", rescan_tree);
-               SET_SENS(mail_factory, "/Remove mailbox", remove_tree);
-               SET_SENS(mail_factory, "/Search folder...", search_folder);
-               SET_SENS(mail_factory, "/Properties...", folder_property);
-               SET_SENS(mail_factory, "/Processing...", folder_processing);
-               SET_SENS(mail_factory, "/Scoring...", folder_scoring);
-       } else if (FOLDER_TYPE(folder) == F_IMAP) {
-               popup = folderview->imap_popup;
-               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
-               SET_SENS(imap_factory, "/Mark all read", mark_all_read);
-               SET_SENS(imap_factory, "/Create new folder...", new_folder);
-               SET_SENS(imap_factory, "/Rename folder...", rename_folder);
-               SET_SENS(imap_factory, "/Delete folder", delete_folder);
-               SET_SENS(imap_factory, "/Check for new messages", update_tree);
-               SET_SENS(imap_factory, "/Rebuild folder tree", rescan_tree);
-               SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
-               SET_SENS(imap_factory, "/Search folder...", search_folder);
-               SET_SENS(imap_factory, "/Properties...", folder_property);
-               SET_SENS(imap_factory, "/Processing...", folder_processing);
-               SET_SENS(imap_factory, "/Scoring...", folder_scoring);
-       } else if (FOLDER_TYPE(folder) == F_NEWS) {
-               popup = folderview->news_popup;
-               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
-               SET_SENS(news_factory, "/Mark all read", mark_all_read);
-               SET_SENS(news_factory, "/Subscribe to newsgroup...", new_folder);
-               SET_SENS(news_factory, "/Remove newsgroup", delete_folder);
-#if 0
-               SET_SENS(news_factory, "/Check for new messages", update_tree);
-#endif
-               SET_SENS(news_factory, "/Remove news account", remove_tree);
-               SET_SENS(news_factory, "/Search folder...", search_folder);
-               SET_SENS(news_factory, "/Properties...", folder_property);
-               SET_SENS(news_factory, "/Processing...", folder_processing);
-               SET_SENS(news_factory, "/Scoring...", folder_scoring);
-       } else if (FOLDER_TYPE(folder) == F_MBOX) {
-               popup = folderview->mbox_popup;
-               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
-               SET_SENS(mbox_factory, "/Create new folder...", new_folder);
-               SET_SENS(mbox_factory, "/Rename folder...", rename_folder);
-               SET_SENS(mbox_factory, "/Delete folder", delete_folder);
-               SET_SENS(news_factory, "/Properties...", folder_property);
-               SET_SENS(mbox_factory, "/Processing...", folder_processing);
-               SET_SENS(mbox_factory, "/Scoring...", folder_scoring);
-       } else
-               return;
+       if (fpopup->set_sensitivity != NULL)
+               fpopup->set_sensitivity(fpopup_factory, item);
 
+       if (item == folder->trash &&
+           gtk_item_factory_get_item(fpopup_factory, "/Empty trash...") == NULL) {
+               gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[0], folderview, 1);
+               gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[1], folderview, 1);
+       } else if (item != folder->trash) {
+               gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[0]);
+               gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[1]);
+       }
+       
+#define SET_SENS(name, sens) \
+       menu_set_sensitive(fpopup_factory, name, sens)
+
+       SET_SENS("/Mark all read", item->unread_msgs >= 1);
+       SET_SENS("/Search folder...", item->total_msgs >= 1 && 
+                folderview->selected == folderview->opened);
+       SET_SENS("/Properties...", item->node->parent != NULL);
+       SET_SENS("/Processing...", item->node->parent != NULL);
+       if (item == folder->trash)
+               SET_SENS("/Empty trash...", folder_item_get_msg_list(item) != NULL);
 #undef SET_SENS
 
+       popup = gtk_item_factory_get_widget(fpopup_factory, fpopup->path);
        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) {
@@ -1603,12 +1537,17 @@ 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;
+
+       if (quicksearch_has_focus(folderview->summaryview->quicksearch))
+               return FALSE;
 
        switch (event->keyval) {
        case GDK_Return:
@@ -1620,7 +1559,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,
@@ -1630,6 +1570,8 @@ static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        default:
                break;
        }
+
+       return FALSE;
 }
 
 static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
@@ -1678,7 +1620,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)
@@ -1698,7 +1640,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);
@@ -1711,6 +1654,9 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
                alertpanel_error(_("Folder could not be opened."));
 
+               folderview->open_folder = FALSE;
+               can_select = TRUE;
+
                return;
         }
 
@@ -1719,7 +1665,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        /* Show messages */
        summary_set_prefs_from_folderitem(folderview->summaryview, item);
        opened = summary_show(folderview->summaryview, item);
-
+       
        folder_clean_cache_memory();
 
        if (!opened) {
@@ -1756,7 +1702,7 @@ static void folderview_tree_collapsed(GtkCTree *ctree, GtkCTreeNode *node,
 
        item = gtk_ctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
-       item->collapsed= TRUE;
+       item->collapsed = TRUE;
        folderview_update_node(folderview, node);
 }
 
@@ -1791,55 +1737,6 @@ static void folderview_col_resized(GtkCList *clist, gint column, gint width,
        }
 }
 
-static GtkCTreeNode *folderview_find_by_name(GtkCTree *ctree,
-                                            GtkCTreeNode *node,
-                                            const gchar *name)
-{
-       FolderItem *item;
-
-       if (!node)
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-       if (!node)
-               return NULL;
-
-       node = GTK_CTREE_ROW(node)->children;
-
-       while (node) {
-               item = gtk_ctree_node_get_row_data(ctree, node);
-               if (!folderview_compare_name(item, name))
-                       return node;
-               node = GTK_CTREE_ROW(node)->sibling;
-       }
-
-       return NULL;
-}
-
-static void folderview_update_tree_cb(FolderView *folderview, guint action,
-                                     GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-
-       if (!folderview->selected) return;
-
-       summary_show(folderview->summaryview, NULL);
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-
-       if (action == 0)
-               folderview_check_new(item->folder);
-       else
-               folderview_rescan_tree(item->folder);
-       
-       if (folderview->opened) {
-               item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
-               if (item)
-                       folder_update_item(item, TRUE);
-       }
-}
-
 void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
 {
        GNode *srcnode;
@@ -1864,7 +1761,9 @@ void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
        gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
        GtkCTreeNode *node, *parent_node;
        
-       parent_node = gtk_ctree_find_by_row_data(ctree, NULL, item->parent);
+       parent_node = gtk_ctree_find_by_row_data(ctree, NULL, folder_item_parent(item));
+       if (parent_node == NULL)
+               return;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
@@ -1883,66 +1782,49 @@ void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
        gtk_clist_thaw(GTK_CLIST(ctree));
 }
 
-static void folderview_new_folder_cb(FolderView *folderview, guint action,
-                                    GtkWidget *widget)
+static void folderview_empty_trash_cb(FolderView *folderview, guint action,
+                                     GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
-       FolderItem *new_item;
-       gchar *new_folder;
-       gchar *name, *name_;
-
+       GSList *mlist = NULL;
+       GSList *cur = NULL;
        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);
-
-       new_folder = input_dialog(_("New folder"),
-                                 _("Input the name of new folder:"),
-                                 _("NewFolder"));
-       if (!new_folder) return;
-
-       if (item->folder->type != F_MBOX) {
-               if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
-                       alertpanel_error(_("`%c' can't be included in folder name."),
-                                        G_DIR_SEPARATOR);
-                       g_free(new_folder);
+       if (item != item->folder->trash) return;
+       
+       if (prefs_common.ask_on_clean) {
+               if (alertpanel(_("Empty trash"),
+                              _("Empty all messages in trash?"),
+                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
                        return;
-               }
        }
-
-       name_ = trim_string(new_folder, 32);
-       Xstrdup_a(name, name_, {g_free(new_folder); return;});
-       g_free(name_);
-
-       /* find whether the directory already exists */
-       if (folderview_find_by_name(ctree, folderview->selected, new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."), name);
-               g_free(new_folder);
-               return;
+       
+       mlist = folder_item_get_msg_list(item);
+       
+       for (cur = mlist ; cur != NULL ; cur = cur->next) {
+               MsgInfo * msginfo = (MsgInfo *) cur->data;
+               partial_mark_for_delete(msginfo);
+               procmsg_msginfo_free(msginfo);
        }
 
-       new_item = folder_create_folder(item, new_folder);
-       if (!new_item) {
-               alertpanel_error(_("Can't create the folder `%s'."), name);
-               g_free(new_folder);
-               return;
-       } 
-       g_free(new_folder);
-
-       folderview_create_folder_node(folderview, new_item);
+       folder_item_remove_all_msg(item);
+}
 
-       folder_write_list();
+static void folderview_search_cb(FolderView *folderview, guint action,
+                                GtkWidget *widget)
+{
+       summary_search(folderview->summaryview);
 }
 
-static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
-                                         GtkWidget *widget)
+static void folderview_property_cb(FolderView *folderview, guint action,
+                                  GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
-       FolderItem *new_item;
-       gchar *new_folder;
 
        if (!folderview->selected) return;
 
@@ -1950,584 +1832,253 @@ static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       new_folder = input_dialog(_("New folder"),
-                                 _("Input the name of new folder:"),
-                                 _("NewFolder"));
-       if (!new_folder) return;
-
-       /* find whether the directory already exists */
-       if (folderview_find_by_name(ctree, folderview->selected, new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."),
-                                new_folder);
-               g_free(new_folder);
+       if (folder_item_parent(item) == NULL)
                return;
-       }
 
-       new_item = folder_create_folder(item, new_folder);
-       g_free(new_folder);
-       if (!new_item) return;
-
-       folderview_create_folder_node(folderview, new_item);
-
-       folder_write_list();
+       prefs_folder_item_open(item);
 }
 
-static void folderview_rename_folder_cb(FolderView *folderview, guint action,
-                                       GtkWidget *widget)
+static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
 {
+       GSList *list = NULL;
+       GSList *done = NULL;
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       gchar *new_folder;
-       gchar *name, *name_;
-       gchar *message;
-       gchar *old_path;
-       gchar *old_id;
-       gchar *new_id;
-
-       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->path != NULL);
-       g_return_if_fail(item->folder != NULL);
-
-       name_ = trim_string(item->name, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
-       message = g_strdup_printf(_("Input new name for `%s':"), name);
-       new_folder = input_dialog(_("Rename folder"), message,
-                                 g_basename(item->path));
-       g_free(message);
-       if (!new_folder) return;
-
-       if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
-               alertpanel_error(_("`%c' can't be included in folder name."),
-                                G_DIR_SEPARATOR);
-               g_free(new_folder);
-               return;
+       
+       for (list = folderview->nodes_to_recollapse; list != NULL; list = g_slist_next(list)) {
+               if (!gtkut_ctree_node_is_parent(GTK_CTREE_NODE(list->data), node)
+               &&  list->data != node) {
+                       gtk_ctree_collapse(ctree, GTK_CTREE_NODE(list->data));
+                       done = g_slist_append(done, GTK_CTREE_NODE(list->data));
+               }
        }
-
-       if (folderview_find_by_name
-               (ctree, GTK_CTREE_ROW(folderview->selected)->parent,
-                new_folder)) {
-               name = trim_string(new_folder, 32);
-               alertpanel_error(_("The folder `%s' already exists."), name);
-               g_free(name);
-               g_free(new_folder);
-               return;
+       for (list = done; list != NULL; list = g_slist_next(list)) {
+               folderview->nodes_to_recollapse = g_slist_remove(folderview->nodes_to_recollapse, 
+                                                                list->data);
        }
+       g_slist_free(done);
+}
 
-       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) {
-               g_free(old_id);
-               g_free(new_folder);
-               return;
-       }
-       g_free(new_folder);
+void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
+                           FolderItem *to_folder)
+{
+       FolderItem *from_parent = NULL;
+       FolderItem *new_folder = NULL;
+       GtkCTreeNode *src_node = NULL;
+       gchar *buf;
+       gint status;
 
-       /* if (FOLDER_TYPE(item->folder) == F_MH)
-               prefs_filtering_rename_path(old_path, item->path); */
-       new_id = folder_item_get_identifier(item);
-       prefs_filtering_rename_path(old_id, new_id);
+       g_return_if_fail(folderview != NULL);
+       g_return_if_fail(from_folder != NULL);
+       g_return_if_fail(to_folder != NULL);
 
-       g_free(old_id);
-       g_free(new_id);
+       src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);
+       from_parent = folder_item_parent(from_folder);
+       buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
+       STATUSBAR_PUSH(folderview->mainwin, buf);
+       g_free(buf);
+       summary_clear_all(folderview->summaryview);
+       folderview->opened = NULL;
+       folderview->selected = NULL;
+       gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), FALSE);
+       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();
+               folder_item_update_recursive(new_folder, F_ITEM_UPDATE_MSGCNT);
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
+               folderview_sort_folders(folderview, 
+                       gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), 
+                               NULL, folder_item_parent(new_folder)), new_folder->folder);
+               folderview_select(folderview, new_folder);
+       } else {
+               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."));
+                       break;
+               case F_MOVE_FAILED_DEST_IS_CHILD:
+                       alertpanel_error(_("Can't move a folder to one of its children."));
+                       break;
+               case F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX:
+                       alertpanel_error(_("Folder moving cannot be done between different mailboxes."));
+                       break;
+               default:
+                       alertpanel_error(_("Move failed!"));
+                       break;
+               }
+       }       
+       inc_unlock();           
+       gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), TRUE);
+}
 
-       folderview_update_node(folderview, folderview->selected);
-       folderview_sort_folders(folderview,
-                               GTK_CTREE_ROW(folderview->selected)->parent,
-                               item->folder);
-       if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
-                                 folderview->selected,
-                                 folderview->opened)) {
-               GtkCTreeNode *node = folderview->opened;
-               folderview_unselect(folderview);
-               folderview_select_node(folderview, node);
-       }
+static gint folderview_clist_compare(GtkCList *clist,
+                                    gconstpointer ptr1, gconstpointer ptr2)
+{
+       FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
+       FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
 
-       gtk_clist_thaw(GTK_CLIST(ctree));
+       if (!item1->name)
+               return (item2->name != NULL);
+       if (!item2->name)
+               return -1;
 
-       folder_write_list();
+       return g_utf8_collate(item1->name, item2->name);
 }
 
-static void folderview_rename_mbox_folder_cb(FolderView *folderview,
-                                            guint action,
-                                            GtkWidget *widget)
+static void folderview_processing_cb(FolderView *folderview, guint action,
+                                    GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
-       gchar *new_folder;
-       gchar *message;
 
        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->path != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       message = g_strdup_printf(_("Input new name for `%s':"),
-                                 g_basename(item->path));
-       new_folder = input_dialog(_("Rename folder"), message,
-                                 g_basename(item->path));
-       g_free(message);
-       if (!new_folder) return;
-
-       if (folderview_find_by_name
-               (ctree, GTK_CTREE_ROW(folderview->selected)->parent,
-                new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."),
-                                new_folder);
-               g_free(new_folder);
-               return;
-       }
-
-       if (item->folder->rename_folder(item->folder, item, new_folder) < 0) {
-               g_free(new_folder);
-               return;
-       }
-       g_free(new_folder);
+       prefs_filtering_open(&item->prefs->processing,
+                            _("Processing configuration"), NULL, NULL);
+}
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
+void folderview_set_target_folder_color(gint color_op) 
+{
+       gint firstone = 1;
+       GList *list;
+       FolderView *folderview;
 
-       folderview_update_node(folderview, folderview->selected);
-       folderview_sort_folders(folderview,
-                               GTK_CTREE_ROW(folderview->selected)->parent,
-                               item->folder);
-       if (folderview->opened == folderview->selected) {
-               if (!GTK_CTREE_ROW(folderview->opened)->children)
-                       gtk_ctree_expand(ctree, folderview->opened);
-               summary_show(folderview->summaryview, item);
+       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;
+               }
        }
-
-       gtk_clist_thaw(GTK_CLIST(ctree));
-
-       folder_write_list();
 }
 
-static void folderview_delete_folder_cb(FolderView *folderview, guint action,
-                                       GtkWidget *widget)
+void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       gchar *message, *name, *name_;
-       AlertValue avalue;
-       gchar *old_path;
-       gchar *old_id;
-
-       if (!folderview->selected) return;
+       folderview_init(folderview);
+       folderview_set_all();
+}
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->path != NULL);
-       g_return_if_fail(item->folder != NULL);
+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;
+}
 
-       name_ = trim_string(item->name, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
-       message = g_strdup_printf
-               (_("All folder(s) and message(s) under `%s' will be deleted.\n"
-                  "Do you really want to delete?"), name);
-       avalue = alertpanel(_("Delete folder"), message,
-                           _("Yes"), _("+No"), NULL);
-       g_free(message);
-       if (avalue != G_ALERTDEFAULT) return;
-
-       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;
+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;
+}
 
-       /* if (FOLDER_TYPE(item->folder) == F_MH)
-               prefs_filtering_delete_path(old_path); */
-
-       if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
-                                 folderview->selected,
-                                 folderview->opened)) {
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-       }
-
-       gtk_ctree_remove_node(ctree, folderview->selected);
-       folder_write_list();
-
-       prefs_filtering_delete_path(old_id);
-       g_free(old_id);
-
-}
-
-static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
-                                        GtkWidget *widget)
+static void drag_state_start(FolderView *folderview, GtkCTreeNode *node, FolderItem *item)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkCTreeNode *node;
-       FolderItem *item;
-       gchar *name, *name_;
-       gchar *message;
-       AlertValue avalue;
-
-       if (!folderview->selected) return;
-       node = folderview->selected;
-       item = gtk_ctree_node_get_row_data(ctree, node);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       if (item->parent) return;
-
-       name_ = trim_string(item->folder->name, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
-       message = g_strdup_printf
-               (_("Really remove the mailbox `%s' ?\n"
-                  "(The messages are NOT deleted from the disk)"), name);
-       avalue = alertpanel(_("Remove mailbox"), message,
-                           _("Yes"), _("+No"), NULL);
-       g_free(message);
-       if (avalue != G_ALERTDEFAULT) return;
-
-       folder_destroy(item->folder);
-       summary_clear_all(folderview->summaryview);
-       folderview_unselect(folderview);
-       gtk_ctree_remove_node(ctree, node);
-       folder_write_list();
+       /* 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_new_imap_folder_cb(FolderView *folderview, guint action,
-                                         GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       FolderItem *new_item;
-       gchar *new_folder;
-       gchar *name, *name_;
-       gchar *p;
-
-       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);
-       g_return_if_fail(item->folder->type == F_IMAP);
-       g_return_if_fail(item->folder->account != NULL);
-
-       new_folder = input_dialog
-               (_("New folder"),
-                _("Input the name of new folder:\n"
-                  "(if you want to create a folder to store subfolders,\n"
-                  " append `/' at the end of the name)"),
-                _("NewFolder"));
-       if (!new_folder) return;
-
-       if ((p = strchr(new_folder, G_DIR_SEPARATOR)) != NULL &&
-           *(p + 1) != '\0') {
-               alertpanel_error(_("`%c' can't be included in folder name."),
-                                G_DIR_SEPARATOR);
-               g_free(new_folder);
-               return;
-       }
-
-       name_ = trim_string(new_folder, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
-
-       /* find whether the directory already exists */
-       if (folderview_find_by_name(ctree, folderview->selected, new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."), name);
-               g_free(new_folder);
-               return;
-       }
-
-       new_item = folder_create_folder(item, new_folder);
-       if (!new_item) {
-               alertpanel_error(_("Can't create the folder `%s'."), name);
-               g_free(new_folder);
-               return;
-       }
-       g_free(new_folder);
-
-       folderview_create_folder_node(folderview, new_item);
-
-       folder_write_list();
-}
-
-static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
-                                        GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       PrefsAccount *account;
-       gchar *name, *name_;
-       gchar *message;
-       AlertValue avalue;
-
-       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);
-       g_return_if_fail(item->folder->type == F_IMAP);
-       g_return_if_fail(item->folder->account != NULL);
-
-       name_ = trim_string(item->folder->name, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
-       message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"), name);
-       avalue = alertpanel(_("Delete IMAP4 account"), message,
-                           _("Yes"), _("+No"), NULL);
-       g_free(message);
-
-       if (avalue != G_ALERTDEFAULT) return;
-
-       if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
-                                 folderview->selected,
-                                 folderview->opened)) {
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-       }
-
-       account = item->folder->account;
-       folder_destroy(item->folder);
-       account_destroy(account);
-       gtk_ctree_remove_node(ctree, folderview->selected);
-       account_set_menu();
-       main_window_reflect_prefs_all();
-       folder_write_list();
-}
-
-static void folderview_new_news_group_cb(FolderView *folderview, guint action,
-                                        GtkWidget *widget)
+static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
+                                 FolderView       *folderview)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
-       GtkCTreeNode *servernode, *node;
-       Folder *folder;
-       FolderItem *item;
-       FolderItem *rootitem;
-       FolderItem *newitem;
-       GSList *new_subscr;
-       GSList *cur;
-       GNode *gnode;
-
-       if (!folderview->selected) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       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->account != NULL);
-
-       if (GTK_CTREE_ROW(folderview->selected)->parent != NULL)
-               servernode = GTK_CTREE_ROW(folderview->selected)->parent;
-       else
-               servernode = folderview->selected;
-
-       rootitem = gtk_ctree_node_get_row_data(ctree, servernode);
-
-       new_subscr = grouplist_dialog(folder);
-
-       /* remove unsubscribed newsgroups */
-       for (gnode = folder->node->children; gnode != NULL; ) {
-               GNode *next = gnode->next;
-
-               item = FOLDER_ITEM(gnode->data);
-               if (g_slist_find_custom(new_subscr, item->path,
-                                       (GCompareFunc)g_strcasecmp) != NULL) {
-                       gnode = next;
-                       continue;
-               }
-
-               node = gtk_ctree_find_by_row_data(ctree, servernode, item);
-               if (!node) {
-                       gnode = next;
-                       continue;
-               }
-
-               if (folderview->opened == node) {
-                       summary_clear_all(folderview->summaryview);
-                       folderview->opened = NULL;
-               }
-
-               folder_item_remove(item);
-               gtk_ctree_remove_node(ctree, node);
-
-               gnode = next;
-       }
-
-       gtk_clist_freeze(GTK_CLIST(ctree));
-
-       /* add subscribed newsgroups */
-       for (cur = new_subscr; cur != NULL; cur = cur->next) {
-               gchar *name = (gchar *)cur->data;
-
-               if (folderview_find_by_name(ctree, servernode, name) != NULL)
-                       continue;
-
-               text[COL_FOLDER] = name;
-               node = gtk_ctree_insert_node(ctree, servernode, NULL, text,
-                                            FOLDER_SPACING,
-                                            folderxpm, folderxpmmask,
-                                            folderopenxpm, folderopenxpmmask,
-                                            FALSE, FALSE);
-               gtk_ctree_expand(ctree, servernode);
-
-               newitem = folder_item_new(folder, name, name);
-               folder_item_append(rootitem, newitem);
-               gtk_ctree_node_set_row_data(ctree, node, newitem);
-       }
-
-       folderview_sort_folders(folderview, servernode, folder);
-       gtk_clist_thaw(GTK_CLIST(ctree));
-
-       slist_free_strings(new_subscr);
-       g_slist_free(new_subscr);
+       GdkDragContext *context;
 
-       folder_write_list();
+       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_rm_news_group_cb(FolderView *folderview, guint action,
-                                       GtkWidget *widget)
+static void folderview_drag_data_get(GtkWidget        *widget,
+                                    GdkDragContext   *drag_context,
+                                    GtkSelectionData *selection_data,
+                                    guint             info,
+                                    guint             time,
+                                    FolderView       *folderview)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
-       gchar *name, *name_;
-       gchar *message;
-       AlertValue avalue;
-
-       if (!folderview->selected) return;
+       GList *cur;
+       gchar *source = NULL;
 
-       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(item->folder->account != NULL);
-
-       name_ = trim_string(item->path, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
-       message = g_strdup_printf(_("Really delete newsgroup `%s'?"), name);
-       avalue = alertpanel(_("Delete newsgroup"), message,
-                           _("Yes"), _("+No"), NULL);
-       g_free(message);
-       if (avalue != G_ALERTDEFAULT) return;
-
-       if (folderview->opened == folderview->selected) {
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = 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;
        }
-
-       folder_item_remove(item);
-       gtk_ctree_remove_node(ctree, folderview->selected);
-       folder_write_list();
 }
 
-static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
-                                        GtkWidget *widget)
+gboolean folderview_update_folder(gpointer source, gpointer userdata)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       PrefsAccount *account;
-       gchar *name, *name_;
-       gchar *message;
-       AlertValue avalue;
-
-       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);
-       g_return_if_fail(item->folder->type == F_NEWS);
-       g_return_if_fail(item->folder->account != NULL);
-
-       name_ = trim_string(item->folder->name, 32);
-       Xstrdup_a(name, name_, return);
-       g_free(name_);
-       message = g_strdup_printf(_("Really delete news account `%s'?"), name);
-       avalue = alertpanel(_("Delete news account"), message,
-                           _("Yes"), _("+No"), NULL);
-       g_free(message);
-
-       if (avalue != G_ALERTDEFAULT) return;
-
-       if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
-                                 folderview->selected,
-                                 folderview->opened)) {
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-       }
+       FolderUpdateData *hookdata;
+       FolderView *folderview;
+       GtkWidget *ctree;
 
-       account = item->folder->account;
-       folder_destroy(item->folder);
-       account_destroy(account);
-       gtk_ctree_remove_node(ctree, folderview->selected);
-       account_set_menu();
-       main_window_reflect_prefs_all();
-       folder_write_list();
-}
+       hookdata = source;
+       folderview = (FolderView *) userdata;   
+       g_return_val_if_fail(hookdata != NULL, FALSE);
+       g_return_val_if_fail(folderview != NULL, FALSE);
 
-static void folderview_search_cb(FolderView *folderview, guint action,
-                                GtkWidget *widget)
-{
-       summary_search(folderview->summaryview);
-}
+       ctree = folderview->ctree;
+       g_return_val_if_fail(ctree != NULL, FALSE);
 
-static void folderview_property_cb(FolderView *folderview, guint action,
-                                  GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
+       if (hookdata->update_flags & FOLDER_ADD_FOLDERITEM)
+               folderview_create_folder_node(folderview, hookdata->item);
+       else if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) {
+               GtkCTreeNode *node;
 
-       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);
+               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 | FOLDER_ADD_FOLDER | FOLDER_REMOVE_FOLDER))
+               folderview_set(folderview);
 
-#if CLAWS
-       prefs_folder_item_create(folderview, item);
-#else
-       /*
-        * CLAWS: wait till Hiro has completed his stuff
-        */
-       if (item->parent == NULL && item->folder->account)
-               account_open(item->folder->account);
-       else
-               prefs_folder_item_open(item);
-#endif 
-}
-
-static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
-{
-       GSList *list = NULL;
-       GSList *done = NULL;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       
-       for (list = folderview->nodes_to_recollapse; list != NULL; list = g_slist_next(list)) {
-               if (!gtkut_ctree_node_is_parent(GTK_CTREE_NODE(list->data), node)
-               &&  list->data != node) {
-                       gtk_ctree_collapse(ctree, GTK_CTREE_NODE(list->data));
-                       done = g_slist_append(done, GTK_CTREE_NODE(list->data));
-               }
-       }
-       for (list = done; list != NULL; list = g_slist_next(list)) {
-               folderview->nodes_to_recollapse = g_slist_remove(folderview->nodes_to_recollapse, 
-                                                                list->data);
-       }
-       g_slist_free(done);
+       return FALSE;
 }
 
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
@@ -2538,53 +2089,59 @@ 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;
+       gint total_height = folderview->ctree->requisition.height;
+       GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
+                               GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+       gfloat vpos = pos->value;
 
        if (gtk_clist_get_selection_info
                (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
+               GtkWidget *srcwidget;
+
+               if (y > height - 24 && height + vpos < total_height)
+                       gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
+
+               if (y < 24 && y > 0)
+                       gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
+
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
                src_item = folderview->summaryview->folder_item;
 
-               if (item && item->folder && item->path &&
-                   src_item && src_item != item) {
-                       switch (item->folder->type) {
-                       case F_MH:
-                       case F_IMAP:
+               srcwidget = gtk_drag_get_source_widget(context);
+               if (srcwidget == folderview->summaryview->ctree) {
+                       /* comes from summaryview */
+                       /* we are copying messages, so only accept folder items that are not
+                          the source item, are no root items and can copy messages */
+                       if (item && item->folder && folder_item_parent(item) != NULL && src_item &&
+                           src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)
                                acceptable = TRUE;
-                               break;
-                       default:
-                               break;
-                       }
-               } 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)
+               } else if (srcwidget == folderview->ctree) {
+                       /* comes from folderview */
+                       /* we are moving folder items, only accept folders that are not
+                           the source items and can copy messages and create folder items */
+                       if (item && item->folder && src_item && src_item != item &&
+                           FOLDER_CLASS(item->folder)->copy_msg != NULL &&
+                           FOLDER_CLASS(item->folder)->create_folder != NULL)
                                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);
@@ -2601,6 +2158,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);
 }
 
@@ -2617,6 +2175,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
@@ -2629,36 +2188,29 @@ 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))) {
+                     src_item && src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)) {
                        return;
                }
                if (item && src_item) {
                        switch (drag_context->action) {
-                               case GDK_ACTION_COPY:
-                                       summary_copy_selected_to(folderview->summaryview, item);
-                                       gtk_drag_finish(drag_context, TRUE, FALSE, time);
-                                       break;
-                               case GDK_ACTION_MOVE:
-                               case GDK_ACTION_DEFAULT:
-                               default:
-                       if (src_item->folder->type != item->folder->type ||
-                           (item->folder->type == F_IMAP &&
-                            src_item->folder != item->folder))
+                       case GDK_ACTION_COPY:
                                summary_copy_selected_to(folderview->summaryview, item);
-                       else
-                               summary_move_selected_to(folderview->summaryview, item);
-                       gtk_drag_finish(drag_context, TRUE, TRUE, time);
+                               gtk_drag_finish(drag_context, TRUE, FALSE, time);
+                               break;
+                       case GDK_ACTION_MOVE:
+                       case GDK_ACTION_DEFAULT:
+                       default:
+                               if (FOLDER_CLASS(src_item->folder)->remove_msg == NULL)
+                                       summary_copy_selected_to(folderview->summaryview, item);
+                               else
+                                       summary_move_selected_to(folderview->summaryview, item);
+                               gtk_drag_finish(drag_context, TRUE, TRUE, time);
                        }
                } else
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);
        } else {
                /* comes from folderview */
                char *source;
-               char *buf;
-               gint status;
-               GtkCTreeNode *src_node;
-               FolderItem *new_item, *src_parent;
                
                source = data->data + 17;
                if (gtk_clist_get_selection_info
@@ -2669,187 +2221,50 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                }
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
-               src_item = folder_find_item_from_path(source);
+               src_item = folder_find_item_from_identifier(source);
 
                if (!item || !src_item || src_item->stype != F_NORMAL) {
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                        return;
                }
-               src_parent = src_item->parent;
-               src_node = gtk_ctree_find_by_row_data(GTK_CTREE(widget), NULL, src_item);
-
-               buf = g_strdup_printf(_("Moving %s to %s..."), src_item->name, item->name);
-               STATUSBAR_PUSH(folderview->mainwin, buf);
-               g_free(buf);
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-               folderview->selected = NULL;
-               gtk_widget_set_sensitive(folderview->ctree, FALSE);
-               inc_lock();
-               main_window_cursor_wait(folderview->mainwin);
-               if ((status = folder_item_move_to(src_item, item, &new_item)) == F_MOVE_OK) {
-                       main_window_cursor_normal(folderview->mainwin);
-                       gtk_drag_finish(drag_context, TRUE, TRUE, time);
-               
-                       if (src_node)
-                               gtk_ctree_remove_node(GTK_CTREE(widget), src_node);
-                       else 
-                               debug_print("can't remove src node: is null\n");
-
-                       STATUSBAR_POP(folderview->mainwin);
-                       folderview_create_folder_node_recursive(folderview, new_item);
-                       folder_update_item(src_parent, TRUE);
-                       folder_update_item_recursive(new_item, TRUE); 
-                       folderview_sort_folders(folderview, 
-                               gtk_ctree_find_by_row_data(GTK_CTREE(widget), 
-                                       NULL, new_item->parent), new_item->folder);
-                       folderview_select(folderview, new_item);
-               } else {
-                       main_window_cursor_normal(folderview->mainwin);
-                       gtk_drag_finish(drag_context, FALSE, FALSE, time);
-                       STATUSBAR_POP(folderview->mainwin);
-                       switch (status) {
-                       case F_MOVE_FAILED_DEST_IS_PARENT:
-                               alertpanel_error(_("Source and destination are the same."));
-                               break;
-                       case F_MOVE_FAILED_DEST_IS_CHILD:
-                               alertpanel_error(_("Can't move a folder to one of its children."));
-                               break;
-                       default:
-                               alertpanel_error(_("Move failed!"));
-                               break;
-                       }
-               }       
-               inc_unlock();           
-               gtk_widget_set_sensitive(folderview->ctree, TRUE);
+
+               folderview_move_folder(folderview, src_item, item);
+               gtk_drag_finish(drag_context, TRUE, TRUE, time);
        }
        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)
+static void folderview_drag_end_cb(GtkWidget       *widget, 
+                                  GdkDragContext   *drag_context,
+                                   FolderView      *folderview)
 {
-       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);
+       drag_state_stop(folderview);
+       g_slist_free(folderview->nodes_to_recollapse);
+       folderview->nodes_to_recollapse = NULL;
 }
 
-void folderview_set_target_folder_color(gint color_op) 
+void folderview_register_popup(FolderViewPopup *fpopup)
 {
-       gint firstone = 1;
-       GList *list;
-       FolderView *folderview;
+       GList *folderviews;
 
-       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;
-               }
-       }
-}
+       for (folderviews = folderview_list; folderviews != NULL; folderviews = g_list_next(folderviews)) {
+               FolderView *folderview = folderviews->data;
+               GtkItemFactory *factory;
 
-void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
-{
-       folderview_init(folderview);
-       folderview_set_all();
+               factory = create_ifactory(folderview, fpopup);
+               g_hash_table_insert(folderview->popups, fpopup->klass, factory);
+       }       
+       g_hash_table_insert(folderview_popups, fpopup->klass, fpopup);
 }
 
-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)
+void folderview_unregister_popup(FolderViewPopup *fpopup)
 {
-       GtkTargetList *list;
-       GdkDragContext *context;
+       GList *folderviews;
 
-       g_return_if_fail(folderview != NULL);
-       if (folderview->selected == NULL) return;
+       for (folderviews = folderview_list; folderviews != NULL; folderviews = g_list_next(folderviews)) {
+               FolderView *folderview = folderviews->data;
 
-       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", item->path);
-                       gtk_selection_data_set(selection_data,
-                                              selection_data->target, 8,
-                                              source, strlen(source));
-                       break;
-               } else
-                       return;
-       }
+               g_hash_table_remove(folderview->popups, fpopup->klass);
+       }       
+       g_hash_table_remove(folderview_popups, fpopup->klass);
 }
-