sync with 0.7.5cvs14
[claws.git] / src / folderview.c
index 61d4f403f73c6b34e50329559968f8db12e1cf59..f2aa44bd11c49fcdf73ba10eb566f2be339141d4 100644 (file)
@@ -55,6 +55,7 @@
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "prefs_filter.h"
+#include "prefs_folder_item.h"
 #include "account.h"
 #include "folder.h"
 #include "inc.h"
@@ -214,9 +215,6 @@ static void folderview_remove_mailbox_cb(FolderView *folderview,
 static void folderview_new_imap_folder_cb(FolderView   *folderview,
                                          guint          action,
                                          GtkWidget     *widget);
-static void folderview_rm_imap_folder_cb (FolderView   *folderview,
-                                         guint          action,
-                                         GtkWidget     *widget);
 static void folderview_rm_imap_server_cb (FolderView   *folderview,
                                          guint          action,
                                          GtkWidget     *widget);
@@ -235,6 +233,10 @@ static void folderview_search_cb   (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void folderview_property_cb     (FolderView     *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -257,7 +259,6 @@ static void folderview_scoring_cb(FolderView *folderview, guint action,
                                  GtkWidget *widget);
 static void folderview_processing_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget);
-static void folderview_property_cb(FolderView *folderview, guint action, GtkWidget *widget);
 
 static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
 {
@@ -297,8 +298,8 @@ 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, NULL, 0, NULL},
-       {N_("/_Delete folder"),         NULL, folderview_rm_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},
@@ -307,7 +308,7 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
        {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_("/_Property..."),           NULL, NULL, 0, NULL},
+       {N_("/_Property..."),           NULL, folderview_property_cb, 0, NULL},
        {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
        {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
@@ -323,7 +324,7 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
        {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_("/_Property..."),            NULL, NULL, 0, NULL},
+       {N_("/_Property..."),            NULL, folderview_property_cb, 0, NULL},
        {N_("/_Processing..."),          NULL, folderview_processing_cb, 0, NULL},
        {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
@@ -852,11 +853,15 @@ void folderview_check_new(Folder *folder)
                     node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                        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;
 
                        folderview_scan_tree_func(item->folder, item, NULL);
-                       folder_item_scan(item);
+                       if (folder_item_scan(item) < 0) {
+                               if (folder && !FOLDER_IS_LOCAL(folder))
+                                       break;
+                       }
                        folderview_update_node(folderview, node);
                }
 
@@ -988,7 +993,9 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = inboxopenxpm;
                        openmask = inboxopenxpmmask;
                }
-               name = g_strdup(_("Inbox"));
+               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) {
@@ -1002,7 +1009,9 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = outboxopenxpm;
                        openmask = outboxopenxpmmask;
                }
-               name = g_strdup(_("Outbox"));
+               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) {
@@ -1016,7 +1025,9 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = queueopenxpm;
                        openmask = queueopenxpmmask;
                }
-               name = g_strdup(_("Queue"));
+               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) {
@@ -1030,7 +1041,9 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = trashopenxpm;
                        openmask = trashopenxpmmask;
                }
-               name = g_strdup(_("Trash"));
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, TRASH_DIR) ? _("Trash") :
+                               item->name);
                break;
        case F_DRAFT:
                xpm = folderxpm;
@@ -1042,7 +1055,9 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openxpm = folderopenxpm;
                        openmask = folderopenxpmmask;
                }
-               name = g_strdup(_("Draft"));
+               name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
+                               !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
+                               item->name);
                break;
        default:
                if (item->hide_read_msgs) {
@@ -1070,8 +1085,13 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                                name = "";
                        }
                        name = g_strconcat(item->name, name, NULL);
-               } else
-                       name = g_strdup(item->name);
+               } else {
+                       if (item->folder->type == F_NEWS &&
+                           !strcmp2(item->name, item->path))
+                               name = get_abbrev_newsgroup_name(item->path);
+                       else
+                               name = g_strdup(item->name);
+               }
        }
 
        if (!GTK_CTREE_ROW(node)->expanded &&
@@ -1116,9 +1136,10 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  itos(item->total));
        }
 
-       if (item->stype == F_TRASH)
+       if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
+           item->stype == F_TRASH) {
                use_bold = use_color = FALSE;
-       if (item->stype == F_QUEUE) {
+       } else if (item->stype == F_QUEUE) {
                /* highlight queue folder if there are any messages */
                use_bold = use_color = (item->total > 0);
        } else {
@@ -1227,18 +1248,19 @@ static void folderview_expand_func(GtkCTree *ctree, GtkCTreeNode *node,
 #define SET_SPECIAL_FOLDER(ctree, item) \
 { \
        if (item) { \
-               GtkCTreeNode *node, *sibling; \
+               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 { \
-                       if (!prev) \
-                               sibling = GTK_CTREE_ROW(root)->children; \
-                       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, root, sibling); \
+                               gtk_ctree_move(ctree, node, parent, sibling); \
                } \
  \
                prev = node; \
@@ -1322,9 +1344,9 @@ void folderview_rename_folder(FolderView *folderview)
                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_IMAP:
        case F_NEWS:
        default:
                break;
@@ -1348,10 +1370,9 @@ void folderview_delete_folder(FolderView *folderview)
        case F_MH:
        case F_MBOX:
        case F_MAILDIR:
+       case F_IMAP:
                folderview_delete_folder_cb(folderview, 0, NULL);
                break;
-       case F_IMAP:
-               folderview_rm_imap_folder_cb(folderview, 0, NULL);
        case F_NEWS:
        default:
                break;
@@ -1376,10 +1397,10 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        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;
-       gboolean search_folder = FALSE;
 
        if (!event) return;
 
@@ -1426,14 +1447,14 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                if (item->parent == NULL)
                        update_tree = remove_tree = TRUE;
                else
-                       mark_all_read = search_folder = TRUE;
+                       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_property = folder_scoring = folder_processing = TRUE;
+                               rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
                        else if (item->stype == F_INBOX)
-                               folder_property = folder_scoring = folder_processing = TRUE;
+                               folder_scoring = folder_processing = TRUE;
                        else if (item->stype == F_TRASH)
                                folder_processing = TRUE;
                        else if (item->stype == F_OUTBOX)
@@ -1462,10 +1483,10 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(mail_factory, "/Check for new messages", update_tree);
                SET_SENS(mail_factory, "/Rescan 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);
                SET_SENS(mail_factory, "/Processing...", folder_processing);
                SET_SENS(mail_factory, "/Scoring...", folder_scoring);
-               SET_SENS(mail_factory, "/Search folder...", search_folder);
        } else if (FOLDER_TYPE(folder) == F_IMAP) {
                popup = folderview->imap_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
@@ -1476,9 +1497,10 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(imap_factory, "/Check for new messages", update_tree);
                SET_SENS(imap_factory, "/Rescan 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);
                SET_SENS(imap_factory, "/Processing...", folder_processing);
                SET_SENS(imap_factory, "/Scoring...", folder_scoring);
-               SET_SENS(imap_factory, "/Search folder...", search_folder);
        } else if (FOLDER_TYPE(folder) == F_NEWS) {
                popup = folderview->news_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
@@ -1490,6 +1512,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
 #endif
                SET_SENS(news_factory, "/Remove news account", remove_tree);
                SET_SENS(news_factory, "/Search folder...", search_folder);
+               SET_SENS(news_factory, "/Property...", folder_property);
                SET_SENS(news_factory, "/Processing...", folder_processing);
                SET_SENS(news_factory, "/Scoring...", folder_scoring);
        } else if (FOLDER_TYPE(folder) == F_MBOX) {
@@ -1498,6 +1521,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                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, "/Property...", folder_property);
                SET_SENS(mbox_factory, "/Processing...", folder_processing);
                SET_SENS(mbox_factory, "/Scoring...", folder_scoring);
        } else
@@ -1563,7 +1587,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                return;
        }
 
-       if (!can_select) {
+       if (!can_select || summary_is_locked(folderview->summaryview)) {
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
                gtk_ctree_select(ctree, folderview->opened);
                return;
@@ -1720,6 +1744,7 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
+       gchar *name, *name_;
        GtkCTreeNode *node;
 
        if (!folderview->selected) return;
@@ -1742,18 +1767,20 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
                }
        }
 
+       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."),
-                                new_folder);
+               alertpanel_error(_("The folder `%s' already exists."), name);
                g_free(new_folder);
                return;
        }
 
        new_item = item->folder->create_folder(item->folder, item, new_folder);
        if (!new_item) {
-               alertpanel_error(_("The folder `%s' could not be created."), 
-                                new_folder);
+               alertpanel_error(_("Can't create the folder `%s'."), name);
                g_free(new_folder);
                return;
        } 
@@ -1832,9 +1859,11 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
        gchar *new_folder;
+       gchar *name, *name_;
        gchar *message;
        gchar *old_path;
-       gchar *new_path;
+       gchar *old_id;
+       gchar *new_id;
 
        if (!folderview->selected) return;
 
@@ -1843,8 +1872,10 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        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));
+       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);
@@ -1860,31 +1891,36 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        if (folderview_find_by_name
                (ctree, GTK_CTREE_ROW(folderview->selected)->parent,
                 new_folder)) {
-               alertpanel_error(_("The folder `%s' already exists."),
-                                new_folder);
+               name = trim_string(new_folder, 32);
+               alertpanel_error(_("The folder `%s' already exists."), name);
+               g_free(name);
                g_free(new_folder);
                return;
        }
 
        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;
        }
-
-       if (strchr(item->path, G_DIR_SEPARATOR) != NULL) {
-               gchar *dirname;
-               dirname = g_dirname(item->path);
-               new_path = g_strconcat(dirname, G_DIR_SEPARATOR_S, new_folder, NULL);
-               g_free(dirname);
-       } else
-               new_path = g_strdup(new_folder);
-
        g_free(new_folder);
 
-       prefs_filter_rename_path(old_path, new_path);
-       g_free(new_path);
+       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);
+       }
+       g_free(old_id);
+       g_free(new_id);
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
@@ -1892,10 +1928,13 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        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, FALSE);
+       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);
        }
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -1963,9 +2002,10 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
-       gchar *message;
+       gchar *message, *name, *name_;
        AlertValue avalue;
        gchar *old_path;
+       gchar *old_id;
 
        if (!folderview->selected) return;
 
@@ -1974,25 +2014,41 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
        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
                (_("All folder(s) and message(s) under `%s' will be deleted.\n"
-                  "Do you really want to delete?"),
-                g_basename(item->path));
+                  "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'."),
-                                item->path);
+               alertpanel_error(_("Can't remove the folder `%s'."), name);
+               if (folderview->opened == folderview->selected)
+                       summary_show(folderview->summaryview,
+                                    folderview->summaryview->folder_item,
+                                    FALSE);
+               g_free(old_id);
                return;
        }
 
-       prefs_filter_delete_path(old_path);
-
+       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 (folderview->opened == folderview->selected ||
            gtk_ctree_is_ancestor(ctree,
                                  folderview->selected,
@@ -2011,6 +2067,7 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node;
        FolderItem *item;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -2021,10 +2078,12 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
        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 disk)"),
-                item->folder->name);
+                  "(The messages are NOT deleted from the disk)"), name);
        avalue = alertpanel(_("Remove folder"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
@@ -2046,6 +2105,7 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
+       gchar *name, *name_;
        gchar *p;
 
        if (!folderview->selected) return;
@@ -2072,18 +2132,20 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
                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."),
-                                new_folder);
+               alertpanel_error(_("The folder `%s' already exists."), name);
                g_free(new_folder);
                return;
        }
 
        new_item = item->folder->create_folder(item->folder, item, new_folder);
        if (!new_item) {
-               alertpanel_error(_("Can't create the folder `%s'."),
-                                new_folder);
+               alertpanel_error(_("Can't create the folder `%s'."), name);
                g_free(new_folder);
                return;
        }
@@ -2106,56 +2168,12 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
        folder_write_list();
 }
 
-static void folderview_rm_imap_folder_cb(FolderView *folderview, guint action,
-                                        GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
-       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);
-
-       message = g_strdup_printf(_("Really delete folder `%s'?"),
-                                 g_basename(item->path));
-       avalue = alertpanel(_("Delete folder"), message,
-                           _("Yes"), _("+No"), NULL);
-       g_free(message);
-       if (avalue != G_ALERTDEFAULT) return;
-
-       if (item->folder->remove_folder(item->folder, item) < 0) {
-               alertpanel_error(_("Can't remove the folder `%s'."),
-                                item->path);
-               if (folderview->opened == folderview->selected)
-                       summary_show(folderview->summaryview,
-                                    folderview->summaryview->folder_item,
-                                    FALSE);
-               return;
-       }
-
-       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();
-}
-
 static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
                                         GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -2167,8 +2185,10 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_IMAP);
        g_return_if_fail(item->folder->account != NULL);
 
-       message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"),
-                                 item->folder->name);
+       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);
@@ -2287,6 +2307,7 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -2298,8 +2319,10 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
-       message = g_strdup_printf(_("Really delete newsgroup `%s'?"),
-                                 g_basename(item->path));
+       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);
@@ -2320,6 +2343,7 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
 
@@ -2331,8 +2355,10 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
        g_return_if_fail(item->folder->type == F_NEWS);
        g_return_if_fail(item->folder->account != NULL);
 
-       message = g_strdup_printf(_("Really delete news account `%s'?"),
-                                 item->folder->name);
+       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);
@@ -2361,6 +2387,28 @@ static void folderview_search_cb(FolderView *folderview, guint action,
        summary_search(folderview->summaryview);
 }
 
+static void folderview_property_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);
+
+#if CLAWS
+       prefs_folder_item_create(folderview, item);
+#else
+       /*
+        * CLAWS: wait till Hiro has completed his stuff
+        */
+       prefs_folder_item_open(item);
+#endif 
+}
+
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -2498,21 +2546,6 @@ static void folderview_processing_cb(FolderView *folderview, guint action,
        prefs_filtering_open(item);
 }
 
-static void folderview_property_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_folder_item_create(folderview, item);
-}
-
 void folderview_set_target_folder_color(gint color_op) 
 {
        gint firstone = 1;