wow, a segfault hiding, waiting to bite
[claws.git] / src / folderview.c
index 490b9281c3134180972c593e12baf96a644e6114..9e9ead87b291776496c75569bc08aa1e5f3f02ce 100644 (file)
@@ -54,7 +54,6 @@
 #include "gtkutils.h"
 #include "prefs_common.h"
 #include "prefs_account.h"
-#include "prefs_filter.h"
 #include "prefs_filtering.h"
 #include "prefs_scoring.h"
 #include "prefs_folder_item.h"
@@ -248,6 +247,15 @@ static void folderview_drag_received_cb  (GtkWidget        *widget,
                                          guint             info,
                                          guint             time,
                                          FolderView       *folderview);
+static void folderview_start_drag       (GtkWidget *widget, gint button, GdkEvent *event,
+                                         FolderView       *folderview);
+static void folderview_drag_data_get     (GtkWidget        *widget,
+                                         GdkDragContext   *drag_context,
+                                         GtkSelectionData *selection_data,
+                                         guint             info,
+                                         guint             time,
+                                         FolderView       *folderview);
+
 static void folderview_scoring_cb(FolderView *folderview, guint action,
                                  GtkWidget *widget);
 static void folderview_processing_cb(FolderView *folderview, guint action,
@@ -276,7 +284,7 @@ static GtkItemFactoryEntry folderview_mail_popup_entries[] =
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),
                                        NULL, folderview_update_tree_cb, 0, NULL},
-       {N_("/R_escan folder tree"),    NULL, folderview_update_tree_cb, 1, 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>"},
@@ -296,7 +304,7 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),
                                        NULL, folderview_update_tree_cb, 0, NULL},
-       {N_("/R_escan folder tree"),    NULL, folderview_update_tree_cb, 1, 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>"},
@@ -340,7 +348,7 @@ FolderView *folderview_create(void)
        gint n_entries;
        gint i;
 
-       debug_print(_("Creating folder view...\n"));
+       debug_print("Creating folder view...\n");
        folderview = g_new0(FolderView, 1);
 
        titles[COL_FOLDER] = _("Folder");
@@ -357,7 +365,7 @@ FolderView *folderview_create(void)
                             prefs_common.folderview_width,
                             prefs_common.folderview_height);
 
-       ctree = gtk_ctree_new_with_titles(N_FOLDER_COLS, COL_FOLDER, titles);
+       ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, COL_FOLDER, titles);
        
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
@@ -425,6 +433,11 @@ FolderView *folderview_create(void)
                           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),
@@ -538,9 +551,9 @@ void folderview_init(FolderView *folderview)
 
 
        if (!normalfont)
-               normalfont = gdk_fontset_load(NORMAL_FONT);
+               normalfont = gtkut_font_load(NORMAL_FONT);
        if (!boldfont)
-               boldfont = gdk_fontset_load(BOLD_FONT);
+               boldfont = gtkut_font_load(BOLD_FONT);
 
        if (!bold_style) {
                bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
@@ -564,7 +577,7 @@ void folderview_set(FolderView *folderview)
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        MainWindow *mainwin = folderview->mainwin;
 
-       debug_print(_("Setting folder info...\n"));
+       debug_print("Setting folder info...\n");
        STATUSBAR_PUSH(mainwin, _("Setting folder info..."));
 
        main_window_cursor_wait(mainwin);
@@ -791,7 +804,7 @@ void folderview_rescan_tree(Folder *folder)
        if (!folder->scan_tree) return;
 
        inc_lock();
-       window = label_window_create(_("Rescanning folder tree..."));
+       window = label_window_create(_("Rebuilding folder tree..."));
 
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
        folder_scan_tree(folder);
@@ -806,6 +819,7 @@ void folderview_rescan_tree(Folder *folder)
        inc_unlock();
 }
 
+#if 0
 void folderview_rescan_all(void)
 {
        GList *list;
@@ -837,6 +851,7 @@ void folderview_rescan_all(void)
        gtk_widget_destroy(window);
        inc_unlock();
 }
+#endif
 
 void folderview_check_new(Folder *folder)
 {
@@ -878,6 +893,34 @@ void folderview_check_new(Folder *folder)
        folder_write_list();
 }
 
+void folderview_check_new_all(void)
+{
+       GList *list;
+       GtkWidget *window;
+       FolderView *folderview;
+
+       folderview = (FolderView *)folderview_list->data;
+
+       inc_lock();
+       main_window_lock(folderview->mainwin);
+       window = label_window_create
+               (_("Checking for new messages in all folders..."));
+
+       list = folder_get_list();
+       for (; list != NULL; list = list->next) {
+               Folder *folder = list->data;
+
+               folderview_check_new(folder);
+       }
+
+       folder_write_list();
+       folderview_set_all();
+
+       gtk_widget_destroy(window);
+       main_window_unlock(folderview->mainwin);
+       inc_unlock();
+}
+
 static gboolean folderview_search_new_recursive(GtkCTree *ctree,
                                                GtkCTreeNode *node)
 {
@@ -974,6 +1017,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkStyle *style = NULL;
+       GtkStyle *color_style = NULL;
        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
        GdkBitmap *mask, *openmask;
@@ -1095,7 +1139,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                            item->path &&
                            !strcmp2(item->name, item->path) &&
                            prefs_common.ng_abbrev_len < strlen(item->path))
-                               name = get_abbrev_newsgroup_name(item->path);
+                               name = get_abbrev_newsgroup_name(item->path, prefs_common.ng_abbrev_len);
                        else
                                name = g_strdup(item->name);
                }
@@ -1161,27 +1205,34 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        gtk_ctree_node_set_foreground(ctree, node, NULL);
 
-       if (use_bold && use_color)
+       if (use_bold && use_color) {
                style = bold_color_style;
-       else if (use_bold) {
+       else if (use_bold) {
                style = bold_style;
                if (item->op_count > 0) {
                        style = bold_tgtfold_style;
                }
-       }
-       else if (use_color) {
+       } else if (use_color) {
                style = normal_color_style;
                gtk_ctree_node_set_foreground(ctree, node,
                                              &folderview->color_new);
-       }
-       else if (item->op_count > 0) {
+       } else if (item->op_count > 0) {
                style = bold_tgtfold_style;
+       } else if (item->prefs->color > 0) {
+               GdkColor gdk_color;
+
+               gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
+               color_style = gtk_style_copy(normal_style);
+               color_style->fg[GTK_STATE_NORMAL] = gdk_color;
+               style = color_style;
        } else {
                style = normal_style;
        }
 
        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);
 }
@@ -1208,15 +1259,41 @@ void folderview_update_item(FolderItem *item, gboolean update_summary)
        }
 }
 
+void folderview_update_items_when_required(gboolean update_summary)
+{
+       GList *list;
+       FolderView *folderview;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+       FolderItem *item;
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
+
+               for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+                    node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+                       item = gtk_ctree_node_get_row_data(ctree, node);
+
+                       if (item->need_update) {
+                               folderview_update_node(folderview, node);
+                               if (update_summary && folderview->opened == node)
+                                       summary_show(folderview->summaryview, item);
+                       }
+               }
+       }
+}
+
 static void folderview_update_item_foreach_func(gpointer key, gpointer val,
                                                gpointer data)
 {
-       folderview_update_item((FolderItem *)key, FALSE);
+       folderview_update_item((FolderItem *)key, (gboolean)data);
 }
 
-void folderview_update_item_foreach(GHashTable *table)
+void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
 {
-       g_hash_table_foreach(table, folderview_update_item_foreach_func, NULL);
+       g_hash_table_foreach(table, folderview_update_item_foreach_func,
+                            (gpointer)update_summary);
 }
 
 static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
@@ -1450,10 +1527,13 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
 
        if (folderview->mainwin->lock_count == 0) {
                new_folder = TRUE;
-               if (item->parent == NULL)
+               if (item->parent == NULL) {
                        update_tree = remove_tree = TRUE;
-               else
+                       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;
@@ -1487,7 +1567,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                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, "/Rescan folder tree", rescan_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, "/Property...", folder_property);
@@ -1501,7 +1581,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                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, "/Rescan folder tree", rescan_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, "/Property...", folder_property);
@@ -1613,18 +1693,19 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                
                olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
                folder_item_write_cache(olditem);
+               summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
        }
 
        /* CLAWS: set compose button type: news folder items 
         * always have a news folder as parent */
        if (item->folder) 
-               main_window_toolbar_set_compose_button
-                       (folderview->mainwin,
+               toolbar_set_compose_button
+                       (folderview->mainwin->toolbar,
                         item->folder->type == F_NEWS ? 
                         COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
 
        if (item->path)
-               debug_print(_("Folder %s is selected\n"), item->path);
+               debug_print("Folder %s is selected\n", item->path);
 
        if (!GTK_CTREE_ROW(row)->children)
                gtk_ctree_expand(ctree, row);
@@ -1639,7 +1720,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        gdk_pointer_ungrab(GDK_CURRENT_TIME);
        }
 
-       if((item->folder->type == F_IMAP) || (item->folder->type == F_NEWS)) {
+       if(((item->folder->type == F_IMAP) && !item->no_select) || (item->folder->type == F_NEWS)) {
                folder_item_scan(item);
        }
 
@@ -1656,12 +1737,13 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        
                folder_item_apply_processing(item);
 
-               debug_print(_("done.\n"));
+               debug_print("done.\n");
                STATUSBAR_POP(folderview->mainwin);
                main_window_cursor_normal(folderview->mainwin);
        }
                
        /* Show messages */
+       summary_set_prefs_from_folderitem(folderview->summaryview, item);
        opened = summary_show(folderview->summaryview, item);
 
        folder_clean_cache_memory();
@@ -1774,6 +1856,12 @@ static void folderview_update_tree_cb(FolderView *folderview, guint action,
                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)
+                       folderview_update_item(item, TRUE);
+       }
 }
 
 static void folderview_new_folder_cb(FolderView *folderview, guint action,
@@ -1818,7 +1906,7 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        if (!new_item) {
                alertpanel_error(_("Can't create the folder `%s'."), name);
                g_free(new_folder);
@@ -1836,6 +1924,8 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
                                     FALSE, FALSE);
        gtk_ctree_expand(ctree, folderview->selected);
        gtk_ctree_node_set_row_data(ctree, node, new_item);
+       if (normal_style)
+               gtk_ctree_node_set_row_style(ctree, node, normal_style);
        folderview_sort_folders(folderview, folderview->selected, item->folder);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -1872,7 +1962,7 @@ static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        g_free(new_folder);
        if (!new_item) return;
 
@@ -1886,6 +1976,8 @@ static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
                                     FALSE, FALSE);
        gtk_ctree_expand(ctree, folderview->selected);
        gtk_ctree_node_set_row_data(ctree, node, new_item);
+       if (normal_style)
+               gtk_ctree_node_set_row_style(ctree, node, normal_style);
        folderview_sort_folders(folderview, folderview->selected, item->folder);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -1948,17 +2040,11 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        }
        g_free(new_folder);
 
-       if (prefs_common.fltlist) {
-               if (folder_get_default_folder() == item->folder)
-                       prefs_filter_rename_path(old_path, item->path);
-               new_id = folder_item_get_identifier(item);
-               prefs_filter_rename_path(old_id, new_id);
-       } else {
-               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);
-       }
+       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_free(old_id);
        g_free(new_id);
 
@@ -2077,17 +2163,11 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       if (prefs_common.fltlist) {
-               if (folder_get_default_folder() == item->folder)
-                       prefs_filter_delete_path(old_path);
-               prefs_filter_delete_path(old_id);
-               g_free(old_id);
-       } else {
-               if (FOLDER_TYPE(item->folder) == F_MH)
-                       prefs_filtering_delete_path(old_path);
-               prefs_filtering_delete_path(old_id);
-               g_free(old_id);
-       }
+       if (FOLDER_TYPE(item->folder) == F_MH)
+               prefs_filtering_delete_path(old_path);
+       prefs_filtering_delete_path(old_id);
+       g_free(old_id);
+
        if (folderview->opened == folderview->selected ||
            gtk_ctree_is_ancestor(ctree,
                                  folderview->selected,
@@ -2182,7 +2262,7 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        if (!new_item) {
                alertpanel_error(_("Can't create the folder `%s'."), name);
                g_free(new_folder);
@@ -2200,6 +2280,8 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
                                     FALSE, FALSE);
        gtk_ctree_expand(ctree, folderview->selected);
        gtk_ctree_node_set_row_data(ctree, node, new_item);
+       if (normal_style)
+               gtk_ctree_node_set_row_style(ctree, node, normal_style);
        folderview_sort_folders(folderview, folderview->selected, item->folder);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -2212,6 +2294,7 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       PrefsAccount *account;
        gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
@@ -2242,8 +2325,9 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
                folderview->opened = NULL;
        }
 
-       account_destroy(item->folder->account);
+       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();
@@ -2382,6 +2466,7 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       PrefsAccount *account;
        gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
@@ -2412,8 +2497,9 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
                folderview->opened = NULL;
        }
 
-       account_destroy(item->folder->account);
-       folder_destroy(item->folder);
+       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();
@@ -2444,7 +2530,10 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        /*
         * CLAWS: wait till Hiro has completed his stuff
         */
-       prefs_folder_item_open(item);
+       if (item->parent == NULL && item->folder->account)
+               account_open(item->folder->account);
+       else
+               prefs_folder_item_open(item);
 #endif 
 }
 
@@ -2518,32 +2607,65 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
        FolderItem *item, *src_item;
        GtkCTreeNode *node;
 
-       if (gtk_clist_get_selection_info
-               (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
-               return;
+       if ((void *)strstr(data->data, "FROM_OTHER_FOLDER") != (void *)data->data) {
+               /* comes from summaryview */
+               if (gtk_clist_get_selection_info
+                       (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
+                       return;
 
-       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 && src_item) {
-               switch (drag_context->action) {
-                       case GDK_ACTION_COPY:
+               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 && 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))
                                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))
-                       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;
+               FolderItem *new_item;
+               source = data->data + 17;
+               if (*source == 0)
+                       return;
+               if (gtk_clist_get_selection_info
+                       (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
+                       return;
+               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);
+               if (!src_item)
+                       return;
+               if (src_item->stype != F_NORMAL)
+                       return;
+               buf = g_strdup_printf(_("Moving %s to %s..."), src_item->name, item->name);
+               STATUSBAR_PUSH(folderview->mainwin, buf);
+               main_window_cursor_wait(folderview->mainwin);
+               if ((new_item = folder_item_move_to(src_item, item)) != NULL)
+                       gtk_drag_finish(drag_context, TRUE, TRUE, time);
                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);
+                       gtk_drag_finish(drag_context, FALSE, FALSE, time);
+               STATUSBAR_PUSH(folderview->mainwin, _("Done."));
+               main_window_cursor_normal(folderview->mainwin);
+               summary_clear_all(folderview->summaryview);
+               if (new_item)
+                       folderview_select(folderview, new_item);
+       }
 }
 
 static gint folderview_clist_compare(GtkCList *clist,
@@ -2621,3 +2743,53 @@ void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
        folderview_init(folderview);
        folderview_set_all();
 }
+
+GtkTargetEntry folderview_drag_types[1] =
+{
+       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+};
+
+
+static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
+                                 FolderView       *folderview)
+{
+       GtkTargetList *list;
+       GdkDragContext *context;
+
+       g_return_if_fail(folderview != NULL);
+       if (folderview->selected == NULL) return;
+
+       list = gtk_target_list_new(folderview_drag_types, 1);
+
+       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;
+       }
+}
+