2006-08-22 [colin] 2.4.0cvs73
[claws.git] / src / folderview.c
index fb28a1f8539ac104408ffc534489ba1dd1eb235f..e905c13851e394417c8da634c616824f5821d0b6 100644 (file)
@@ -65,6 +65,9 @@
 #include "partial_download.h"
 #include "prefs_folder_column.h"
 #include "filtering.h"
+#include "quicksearch.h"
+#include "manual.h"
+#include "timing.h"
 
 #define COL_FOLDER_WIDTH       150
 #define COL_NUM_WIDTH          32
@@ -227,6 +230,10 @@ static void folderview_empty_trash_cb      (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void folderview_send_queue_cb   (FolderView     *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void folderview_search_cb       (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -285,14 +292,19 @@ static GtkItemFactoryEntry folderview_common_popup_entries[] =
 };
 
 static GtkItemFactoryEntry folder_view_trash_popup_entries[] = {
-       {N_("/------"),                 NULL, NULL, 0, "<Separator>"},
+       {"/------trashsep",             NULL, NULL, 0, "<Separator>"},
        {N_("/Empty _trash..."),        NULL, folderview_empty_trash_cb, 0, NULL},
 };
 
+static GtkItemFactoryEntry folder_view_queue_popup_entries[] = {
+       {"/------queuesep",     NULL, NULL, 0, "<Separator>"},
+       {N_("/Send _queue..."), NULL, folderview_send_queue_cb, 0, NULL},
+};
+
 
 GtkTargetEntry folderview_drag_types[] =
 {
-       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY},
+       {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY},
        {"text/uri-list", 0, TARGET_MAIL_URI_LIST}
 };
 
@@ -431,6 +443,7 @@ GtkWidget *folderview_ctree_create(FolderView *folderview)
        titles[col_pos[F_COL_FOLDER]] = _("Folder");
        titles[col_pos[F_COL_NEW]]    = _("New");
        titles[col_pos[F_COL_UNREAD]] = _("Unread");
+       /* TRANSLATORS: This in Number sign in American style */
        titles[col_pos[F_COL_TOTAL]]  = _("#");
 
        ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
@@ -660,6 +673,9 @@ void folderview_set(FolderView *folderview)
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        MainWindow *mainwin = folderview->mainwin;
 
+       if (!mainwin)
+               return;
+
        debug_print("Setting folder info...\n");
        STATUSBAR_PUSH(mainwin, _("Setting folder info..."));
 
@@ -713,19 +729,19 @@ static void mark_all_read_cb(FolderView *folderview, guint action,
        if (item == NULL)
                return;
 
-       if (prefs_common.ask_mark_all_read) {
+       if (folderview->summaryview->folder_item != item
+       &&  prefs_common.ask_mark_all_read) {
                val = alertpanel_full(_("Mark all as read"),
                        _("Do you really want to mark all mails in this "
                          "folder as read ?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
-                         TRUE, NULL, ALERT_QUESTION, G_ALERTALTERNATE);
+                         TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
-               if (val == G_ALERTDEFAULT ||
-                   val == (G_ALERTDEFAULT|G_ALERTDISABLE))
+               if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
                        return;
-               else if (val == (G_ALERTALTERNATE|G_ALERTDISABLE))
+               else if (val & G_ALERTDISABLE)
                        prefs_common.ask_mark_all_read = FALSE;
        }
-       
+
        summary_lock(folderview->summaryview);
        folder_item_update_freeze();
        if (folderview->summaryview->folder_item == item)
@@ -764,6 +780,54 @@ void folderview_unselect(FolderView *folderview)
        folderview->selected = folderview->opened = NULL;
 }
 
+static GtkCTreeNode *folderview_find_next_marked(GtkCTree *ctree,
+                                                GtkCTreeNode *node)
+{
+       FolderItem *item;
+
+       if (node)
+               node = gtkut_ctree_node_next(ctree, node);
+       else
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+               item = gtk_ctree_node_get_row_data(ctree, node);
+               if (item && item->marked_msgs > 0 && item->stype != F_TRASH)
+                       return node;
+       }
+
+       return NULL;
+}
+
+void folderview_select_next_marked(FolderView *folderview)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCTreeNode *node = NULL;
+       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       gboolean last_open = prefs_common.always_show_msg;
+       
+       prefs_common.select_on_entry = SELECTONENTRY_MNU;
+       prefs_common.always_show_msg = TRUE;
+
+       if ((node = folderview_find_next_marked(ctree, folderview->opened))
+           != NULL) {
+               folderview_select_node(folderview, node);
+               goto out;
+       }
+
+       if (!folderview->opened ||
+           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
+               goto out;
+       }
+       /* search again from the first node */
+       if ((node = folderview_find_next_marked(ctree, NULL)) != NULL)
+               folderview_select_node(folderview, node);
+
+out:
+       prefs_common.select_on_entry = last_sel;
+       prefs_common.always_show_msg = last_open;
+}
+
 static GtkCTreeNode *folderview_find_next_unread(GtkCTree *ctree,
                                                 GtkCTreeNode *node)
 {
@@ -787,19 +851,29 @@ void folderview_select_next_unread(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
+       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       gboolean last_open = prefs_common.always_show_msg;
+       
+       prefs_common.select_on_entry = SELECTONENTRY_UNM;
+       prefs_common.always_show_msg = TRUE;
 
        if ((node = folderview_find_next_unread(ctree, folderview->opened))
            != NULL) {
                folderview_select_node(folderview, node);
-               return;
+               goto out;
        }
 
        if (!folderview->opened ||
-           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list))
-               return;
+           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
+               goto out;
+       }
        /* search again from the first node */
        if ((node = folderview_find_next_unread(ctree, NULL)) != NULL)
                folderview_select_node(folderview, node);
+
+out:
+       prefs_common.select_on_entry = last_sel;
+       prefs_common.always_show_msg = last_open;
 }
 
 static GtkCTreeNode *folderview_find_next_new(GtkCTree *ctree,
@@ -825,19 +899,29 @@ void folderview_select_next_new(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
+       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       gboolean last_open = prefs_common.always_show_msg;
+       
+       prefs_common.select_on_entry = SELECTONENTRY_NUM;
+       prefs_common.always_show_msg = TRUE;
 
        if ((node = folderview_find_next_new(ctree, folderview->opened))
            != NULL) {
                folderview_select_node(folderview, node);
-               return;
+               goto out;
        }
 
        if (!folderview->opened ||
-           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list))
-               return;
+           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
+               goto out;
+       }
        /* search again from the first node */
        if ((node = folderview_find_next_new(ctree, NULL)) != NULL)
                folderview_select_node(folderview, node);
+
+out:
+       prefs_common.select_on_entry = last_sel;
+       prefs_common.always_show_msg = last_open;
 }
 
 FolderItem *folderview_get_selected_item(FolderView *folderview)
@@ -920,30 +1004,51 @@ void folderview_append_item(FolderItem *item)
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
-
+#ifndef HAVE_LIBETPAN
+       static gboolean missing_imap_warning = TRUE;
+#endif
        list = folder_get_list();
 
-       for (; list != NULL; list = list->next)
+       for (; list != NULL; list = list->next) {
+#ifndef HAVE_LIBETPAN
+               if ((FOLDER(list->data))
+               &&  (FOLDER(list->data))->klass
+               &&  (FOLDER(list->data))->klass->type == F_IMAP
+               &&  missing_imap_warning) {
+                       missing_imap_warning = FALSE;
+                       alertpanel_error(
+                               _("You have one or more IMAP accounts "
+                                 "defined. However this version of "
+                                 "Sylpheed-Claws has been built without "
+                                 "IMAP support; your IMAP account(s) are "
+                                 "disabled.\n\n"
+                                 "You probably need to "
+                                 "install libetpan and recompile "
+                                 "Sylpheed-Claws."));
+               }
+#endif
                folderview_append_folder(folderview, FOLDER(list->data));
+       }
 }
 
+static gchar *get_scan_str(FolderItem *item)
+{
+       if (item->path)
+               return g_strdup_printf(_("Scanning folder %s%c%s ..."),
+                                     item->folder->name, G_DIR_SEPARATOR,
+                                     item->path);
+       else
+               return g_strdup_printf(_("Scanning folder %s ..."),
+                                     item->folder->name);      
+}
 static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
                                      gpointer data)
 {
        GList *list;
-
        for (list = folderview_list; list != NULL; list = list->next) {
                FolderView *folderview = (FolderView *)list->data;
                MainWindow *mainwin = folderview->mainwin;
-               gchar *str;
-
-               if (item->path)
-                       str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
-                                             item->folder->name, G_DIR_SEPARATOR,
-                                             item->path);
-               else
-                       str = g_strdup_printf(_("Scanning folder %s ..."),
-                                             item->folder->name);
+               gchar *str = get_scan_str(item);
 
                STATUSBAR_PUSH(mainwin, str);
                STATUSBAR_POP(mainwin);
@@ -1011,24 +1116,51 @@ gint folderview_check_new(Folder *folder)
 
                for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
                     node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+                       gchar *str = NULL;
                        item = gtk_ctree_node_get_row_data(ctree, node);
                        if (!item || !item->path || !item->folder) continue;
                        if (item->no_select) continue;
                        if (folder && folder != item->folder) continue;
                        if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
                        if (!item->prefs->newmailcheck) continue;
+                       if (item->processing_pending == TRUE) {
+                               debug_print("skipping %s, processing pending\n",
+                                       item->path ? item->path : item->name);
+                               continue;
+                       }
+
+                       str = get_scan_str(item);
+
+                       STATUSBAR_PUSH(folderview->mainwin, str);
+                       GTK_EVENTS_FLUSH();
+                       g_free(str);
 
                        folderview_scan_tree_func(item->folder, item, NULL);
                        former_new    = item->new_msgs;
                        former_unread = item->unread_msgs;
                        former_total  = item->total_msgs;
 
-                       if (folder_item_scan(item) < 0) {
-                               summaryview_unlock(folderview->summaryview, item);
-                               if (folder && !FOLDER_IS_LOCAL(folder))
-                                       break;
+                       if (item->folder->klass->scan_required &&
+                           (item->folder->klass->scan_required(item->folder, item) ||
+                            item->folder->inbox == item ||
+                            item->opened == TRUE ||
+                            item->processing_pending == TRUE)) {
+                               if (folder_item_scan(item) < 0) {
+                                       summaryview_unlock(folderview->summaryview, item);
+                                       if (folder && !FOLDER_IS_LOCAL(folder)) {
+                                               STATUSBAR_POP(folderview->mainwin);
+                                               break;
+                                       }
+                               }
+                       } else if (!item->folder->klass->scan_required) {
+                               if (folder_item_scan(item) < 0) {
+                                       summaryview_unlock(folderview->summaryview, item);
+                                       if (folder && !FOLDER_IS_LOCAL(folder)) {
+                                               STATUSBAR_POP(folderview->mainwin);
+                                               break;
+                                       }
+                               }
                        }
-
                        if (former_new    != item->new_msgs ||
                            former_unread != item->unread_msgs ||
                            former_total  != item->total_msgs)
@@ -1036,6 +1168,7 @@ gint folderview_check_new(Folder *folder)
 
                        new_msgs += item->new_msgs;
                        former_new_msgs += former_new;
+                       STATUSBAR_POP(folderview->mainwin);
                }
 
                main_window_unlock(folderview->mainwin);
@@ -1443,9 +1576,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        color_style->fg[GTK_STATE_NORMAL] = gdk_color;
                        style = color_style;
                } else if (use_color) {
-                       gtkut_convert_int_to_gdk_color(prefs_common.color_new, &gdk_color);
-                       bold_color_style = gtk_style_copy(bold_style);
-                       bold_color_style->fg[GTK_STATE_NORMAL] = gdk_color;
                        style = bold_color_style;
                } else
                        style = bold_style;
@@ -1453,11 +1583,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        style = bold_tgtfold_style;
                }
        } else if (use_color) {
-               GdkColor gdk_color;
-
-               gtkut_convert_int_to_gdk_color(prefs_common.color_new, &gdk_color);
-               style = gtk_style_copy(normal_color_style);
-               style->fg[GTK_STATE_NORMAL] = gdk_color;
+               style = normal_color_style;
                gtk_ctree_node_set_foreground(ctree, node,
                                              &folderview->color_new);
        } else if (item->op_count > 0) {
@@ -1541,7 +1667,8 @@ gboolean folderview_update_item_claws(gpointer source, gpointer data)
                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);
+                       if (!quicksearch_is_active(folderview->summaryview->quicksearch))
+                               summary_show(folderview->summaryview, update_info->item);
        }
        
        return FALSE;
@@ -1656,7 +1783,7 @@ static void folderview_append_folder(FolderView *folderview, Folder *folder)
 
        g_return_if_fail(folder != NULL);
 
-       root = gtk_ctree_insert_gnode(ctree, NULL, NULL, folder->node,
+       root = gtk_sctree_insert_gnode(ctree, NULL, NULL, folder->node,
                                      folderview_gnode_func, folderview);
        gtk_ctree_pre_recursive(ctree, root, folderview_expand_func,
                                folderview);
@@ -1675,7 +1802,7 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        FolderViewPopup *fpopup;
        GtkItemFactory *fpopup_factory;
        GtkWidget *popup;
-       FolderItem *special_trash = NULL;
+       FolderItem *special_trash = NULL, *special_queue = NULL;
        PrefsAccount *ac;
 
        if (!event) return FALSE;
@@ -1741,9 +1868,11 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        if (fpopup->set_sensitivity != NULL)
                fpopup->set_sensitivity(fpopup_factory, item);
 
-       if (NULL != (ac = account_find_from_item(item)))
+       if (NULL != (ac = account_find_from_item(item))) {
                special_trash = account_get_special_folder(ac, F_TRASH);
-
+               special_queue = account_get_special_folder(ac, F_QUEUE);
+       }
+       
        if ((item == folder->trash || item == special_trash
             || folder_has_parent_of_type(item, F_TRASH)) &&
            gtk_item_factory_get_item(fpopup_factory, "/Empty trash...") == NULL) {
@@ -1755,13 +1884,24 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
                gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[1]);
        }
        
+       if ((item == folder->queue || item == special_queue
+            || folder_has_parent_of_type(item, F_QUEUE)) &&
+           gtk_item_factory_get_item(fpopup_factory, "/Send queue...") == NULL) {
+               gtk_item_factory_create_item(fpopup_factory, &folder_view_queue_popup_entries[0], folderview, 1);
+               gtk_item_factory_create_item(fpopup_factory, &folder_view_queue_popup_entries[1], folderview, 1);
+       } else if (item != folder->queue && (special_queue == NULL || item != special_queue)
+               && !folder_has_parent_of_type(item, F_QUEUE)) {
+               gtk_item_factory_delete_entry(fpopup_factory, &folder_view_queue_popup_entries[0]);
+               gtk_item_factory_delete_entry(fpopup_factory, &folder_view_queue_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("/Properties...", TRUE);
        SET_SENS("/Processing...", item->node->parent != NULL);
        if (item == folder->trash || item == special_trash
            || folder_has_parent_of_type(item, F_TRASH)) {
@@ -1769,6 +1909,12 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
                SET_SENS("/Empty trash...", msglist != NULL);
                procmsg_msg_list_free(msglist);
        }
+       if (item == folder->queue || item == special_queue
+           || folder_has_parent_of_type(item, F_QUEUE)) {
+               GSList *msglist = folder_item_get_msg_list(item);
+               SET_SENS("/Send queue...", msglist != NULL);
+               procmsg_msg_list_free(msglist);
+       }
 #undef SET_SENS
 
        popup = gtk_item_factory_get_widget(fpopup_factory, fpopup->path);
@@ -1826,6 +1972,27 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        return FALSE;
 }
 
+typedef struct _PostponedSelectData
+{
+       GtkCTree *ctree;
+       GtkCTreeNode *row;
+       gint column;
+       FolderView *folderview;
+} PostponedSelectData;
+
+static gboolean postpone_select(void *data)
+{
+       PostponedSelectData *psdata = (PostponedSelectData *)data;
+       debug_print("trying again\n");
+       psdata->folderview->open_folder = TRUE;
+       main_window_cursor_normal(psdata->folderview->mainwin);
+       STATUSBAR_POP(psdata->folderview->mainwin);
+       folderview_selected(psdata->ctree, psdata->row,
+                           psdata->column, psdata->folderview);
+       g_free(psdata);
+       return FALSE;
+}
+
 static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                                gint column, FolderView *folderview)
 {
@@ -1833,24 +2000,34 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        gboolean opened;
        FolderItem *item;
        gchar *buf;
-
+       int res = 0;
+       START_TIMING("--- folderview_selected");
        folderview->selected = row;
 
        if (folderview->opened == row) {
                folderview->open_folder = FALSE;
+               END_TIMING();
                return;
        }
        
        if (!can_select || summary_is_locked(folderview->summaryview)) {
-               gtkut_ctree_set_focus_row(ctree, folderview->opened);
-               gtk_ctree_select(ctree, folderview->opened);
+               if (folderview->opened) {
+                       gtkut_ctree_set_focus_row(ctree, folderview->opened);
+                       gtk_ctree_select(ctree, folderview->opened);
+               }
+               END_TIMING();
                return;
        }
 
-       if (!folderview->open_folder) return;
-
+       if (!folderview->open_folder) {
+               END_TIMING();
+               return;
+       }
        item = gtk_ctree_node_get_row_data(ctree, row);
-       if (!item || item->no_select) return;
+       if (!item || item->no_select) {
+               END_TIMING();
+               return;
+       }
 
        can_select = FALSE;
 
@@ -1861,10 +2038,17 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                
                olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
                if (olditem) {
+                       buf = g_strdup_printf(_("Closing Folder %s..."), 
+                               olditem->path ? olditem->path:olditem->name);
                        /* will be null if we just moved the previously opened folder */
+                       STATUSBAR_PUSH(folderview->mainwin, buf);
+                       main_window_cursor_wait(folderview->mainwin);
+                       g_free(buf);
                        summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
                        summary_show(folderview->summaryview, NULL);
                        folder_item_close(olditem);
+                       main_window_cursor_normal(folderview->mainwin);
+                       STATUSBAR_POP(folderview->mainwin);
                }
        }
 
@@ -1901,7 +2085,8 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        main_window_cursor_wait(folderview->mainwin);
 
-       if (folder_item_open(item) != 0) {
+       res = folder_item_open(item);
+       if (res == -1) {
                main_window_cursor_normal(folderview->mainwin);
                STATUSBAR_POP(folderview->mainwin);
 
@@ -1909,9 +2094,22 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
                folderview->open_folder = FALSE;
                can_select = TRUE;
-
+               END_TIMING();
                return;
-        }
+        } else if (res == -2) {
+               PostponedSelectData *data = g_new0(PostponedSelectData, 1);
+               data->ctree = ctree;
+               data->row = row;
+               data->column = column;
+               data->folderview = folderview;
+               debug_print("postponing open of %s till end of scan\n",
+                       item->path ? item->path:item->name);
+               folderview->open_folder = FALSE;
+               can_select = TRUE;
+               g_timeout_add(500, postpone_select, data);
+               END_TIMING();
+               return;
+       }
        
        main_window_cursor_normal(folderview->mainwin);
 
@@ -1919,7 +2117,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        summary_set_prefs_from_folderitem(folderview->summaryview, item);
        opened = summary_show(folderview->summaryview, item);
        
-       folder_clean_cache_memory();
+       folder_clean_cache_memory(item);
 
        if (!opened) {
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
@@ -1935,6 +2133,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        folderview->open_folder = FALSE;
        can_select = TRUE;
+       END_TIMING();
 }
 
 static void folderview_tree_expanded(GtkCTree *ctree, GtkCTreeNode *node,
@@ -2074,6 +2273,64 @@ static void folderview_empty_trash_cb(FolderView *folderview, guint action,
        folder_item_remove_all_msg(item);
 }
 
+static void folderview_send_queue_cb(FolderView *folderview, guint action,
+                                     GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+       FolderItem *special_queue = NULL;
+       PrefsAccount *ac;
+       gchar *errstr = 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);
+
+       if (NULL != (ac = account_find_from_item(item)))
+               special_queue = account_get_special_folder(ac, F_QUEUE);
+
+       if (item != item->folder->queue && item != special_queue
+       &&  !folder_has_parent_of_type(item, F_QUEUE)) return;
+       
+       if (procmsg_queue_is_empty(item))
+               return;
+
+       if (prefs_common.work_offline)
+               if (alertpanel(_("Offline warning"), 
+                              _("You're working offline. Override?"),
+                              GTK_STOCK_NO, GTK_STOCK_YES,
+                              NULL) != G_ALERTALTERNATE)
+               return;
+
+       /* ask for confirmation before sending queued messages only
+          in online mode and if there is at least one message queued
+          in any of the folder queue
+       */
+       if (prefs_common.confirm_send_queued_messages) {
+               if (!prefs_common.work_offline) {
+                       if (alertpanel(_("Send queued messages"), 
+                                  _("Send all queued messages?"),
+                                  GTK_STOCK_CANCEL, _("_Send"),
+                                  NULL) != G_ALERTALTERNATE)
+                               return;
+               }
+       }
+
+       if (procmsg_send_queue(item, prefs_common.savemsg, &errstr) < 0) {
+               if (!errstr)
+                       alertpanel_error_log(_("Some errors occurred while "
+                                          "sending queued messages."));
+               else {
+                       gchar *tmp = g_strdup_printf(_("Some errors occurred "
+                                       "while sending queued messages:\n%s"), errstr);
+                       g_free(errstr);
+                       alertpanel_error_log(tmp);
+                       g_free(tmp);
+               }
+       }
+}
+
 static void folderview_search_cb(FolderView *folderview, guint action,
                                 GtkWidget *widget)
 {
@@ -2092,9 +2349,6 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       if (folder_item_parent(item) == NULL)
-               return;
-
        prefs_folder_item_open(item);
 }
 
@@ -2143,10 +2397,9 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
                                         NULL, ALERT_QUESTION, G_ALERTDEFAULT);
                g_free(buf);
 
-               if (status != G_ALERTALTERNATE
-                && status != (G_ALERTALTERNATE | G_ALERTDISABLE))
+               if ((status & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
                        return;
-               if (status & G_ALERTDISABLE)
+               else if (status & G_ALERTDISABLE)
                        prefs_common.warn_dnd = FALSE;
        }
 
@@ -2227,7 +2480,8 @@ static void folderview_processing_cb(FolderView *folderview, guint action,
        title = g_strdup_printf (_("Processing configuration for folder %s"), id);
        g_free (id);
 
-       prefs_filtering_open(&item->prefs->processing, title, NULL, NULL);
+       prefs_filtering_open(&item->prefs->processing, title,
+                       MANUAL_ANCHOR_PROCESSING, NULL, NULL, FALSE);
        g_free (title);
 }
 
@@ -2252,8 +2506,7 @@ static gchar *last_font = NULL;
 void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
 {
        /* force reinit */
-       if (last_font) 
-               g_free(last_font);
+       g_free(last_font);
        last_font = NULL;
        
 }
@@ -2270,9 +2523,7 @@ void folderview_reflect_prefs(void)
        if (last_font && !strcmp(last_font, NORMAL_FONT))
                update_font = FALSE;
 
-       if (last_font)
-               g_free(last_font);
-       
+       g_free(last_font);
        last_font = g_strdup(NORMAL_FONT);
 
        if (update_font) {              
@@ -2407,7 +2658,11 @@ gboolean folderview_update_folder(gpointer source, gpointer userdata)
 
        if (hookdata->update_flags & FOLDER_ADD_FOLDERITEM)
                folderview_create_folder_node(folderview, hookdata->item);
-       else if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) {
+       else if (hookdata->update_flags & FOLDER_RENAME_FOLDERITEM) {
+               GtkCTreeNode *node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree),
+                               NULL, folder_item_parent(hookdata->item));
+               folderview_sort_folders(folderview, node, hookdata->folder);
+       } else if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) {
                GtkCTreeNode *node;
 
                node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
@@ -2466,7 +2721,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                            FOLDER_CLASS(item->folder)->copy_msg != NULL &&
                            FOLDER_CLASS(item->folder)->create_folder != NULL)
                                acceptable = TRUE;
-               } else if (srcwidget == NULL) {
+               } else {
                        /* comes from another app */
                        /* we are adding messages, so only accept folder items that are 
                           no root items and can copy messages */
@@ -2491,7 +2746,8 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                        (context->actions == GDK_ACTION_COPY ?
                                        GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
        } else {
-               gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
+               if (folderview->opened)
+                       gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
                gdk_drag_status(context, 0, time);
        }
 
@@ -2512,6 +2768,45 @@ static void free_info (gpointer stuff, gpointer data)
        g_free(stuff);
 }
 
+void folderview_finish_dnd(const gchar *data, GdkDragContext *drag_context,
+                          guint time, FolderItem *item)
+{
+       GList *list, *tmp;
+       GSList *msglist = NULL;
+       list = uri_list_extract_filenames(data);
+       if (!(item && item->folder && folder_item_parent(item) != NULL
+                   && FOLDER_CLASS(item->folder)->add_msg != NULL))
+       {
+               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+               return;
+       }       
+       if (!list) {
+               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+               return;
+       }
+       for (tmp = list; tmp != NULL; tmp = tmp->next) {
+               MsgFileInfo *info = NULL;
+
+               if (file_is_email((gchar *)tmp->data)) {
+                       info = g_new0(MsgFileInfo, 1);
+                       info->msginfo = NULL;
+                       info->file = (gchar *)tmp->data;
+                       msglist = g_slist_prepend(msglist, info);
+               }
+       }
+       if (msglist) {
+               msglist = g_slist_reverse(msglist);
+               folder_item_add_msgs(item, msglist, FALSE);
+               g_slist_foreach(msglist, free_info, NULL);
+               g_slist_free(msglist);
+               gtk_drag_finish(drag_context, TRUE, FALSE, time);
+       } else {
+               gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
+       }
+       list_free_strings(list);
+       g_list_free(list);
+}
+
 static void folderview_drag_received_cb(GtkWidget        *widget,
                                        GdkDragContext   *drag_context,
                                        gint              x,
@@ -2593,8 +2888,6 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                }
                folderview->nodes_to_recollapse = NULL;
        } else if (info == TARGET_MAIL_URI_LIST) {
-               GList *list, *tmp;
-               GSList *msglist = NULL;
                if (gtk_clist_get_selection_info
                        (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
                        return;
@@ -2609,28 +2902,7 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                        return;
                }
-               list = uri_list_extract_filenames((const gchar *)data->data);
-               if (!list) {
-                       gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
-                       return;
-               }
-               for (tmp = list; tmp != NULL; tmp = tmp->next) {
-                       MsgFileInfo *info = g_new0(MsgFileInfo, 1);
-                       info->msginfo = NULL;
-                       info->file = (gchar *)tmp->data;
-                       msglist = g_slist_prepend(msglist, info);
-               }
-               if (msglist) {
-                       msglist = g_slist_reverse(msglist);
-                       folder_item_add_msgs(item, msglist, FALSE);
-                       g_slist_foreach(msglist, free_info, NULL);
-                       g_slist_free(msglist);
-                       gtk_drag_finish(drag_context, TRUE, FALSE, time);
-               } else {
-                       gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
-               }
-               list_free_strings(list);
-               g_list_free(list);
+               folderview_finish_dnd(data->data, drag_context, time, item);
        }
 }