add missing semi-colon
[claws.git] / src / imap_gtk.c
index 228936c..11f2d1f 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto & the Claws Mail Team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto & the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -31,6 +32,7 @@
 
 #include "utils.h"
 #include "folder.h"
+#include "folder_item_prefs.h"
 #include "folderview.h"
 #include "menu.h"
 #include "account.h"
 #include "prefs_common.h"
 #include "statusbar.h"
 #include "summaryview.h"
+#include "prefs_actions.h"
+
+static void new_folder_cb(GtkAction *action, gpointer data);
+static void rename_folder_cb(GtkAction *action, gpointer data);
+static void move_folder_cb(GtkAction *action, gpointer data);
+static void copy_folder_cb(GtkAction *action, gpointer data);
+static void delete_folder_cb(GtkAction *action, gpointer data);
+static void update_tree_cb(GtkAction *action, gpointer data);
+static void download_cb(GtkAction *action, gpointer data);
+static void sync_cb(GtkAction *action, gpointer data);
+static void subscribed_cb(GtkAction *action, gpointer data);
+static void subscribe_cb(GtkAction *action, gpointer data);
+static void unsubscribe_cb(GtkAction *action, gpointer data);
+
+static GtkActionEntry imap_popup_entries[] =
+{
+       {"FolderViewPopup/CreateNewFolder",     NULL, N_("Create _new folder..."), NULL, NULL, G_CALLBACK(new_folder_cb) },
+
+       {"FolderViewPopup/RenameFolder",        NULL, N_("_Rename folder..."), NULL, NULL, G_CALLBACK(rename_folder_cb) },
+       {"FolderViewPopup/MoveFolder",          NULL, N_("M_ove folder..."), NULL, NULL, G_CALLBACK(move_folder_cb) },
+       {"FolderViewPopup/CopyFolder",          NULL, N_("Cop_y folder..."), NULL, NULL, G_CALLBACK(copy_folder_cb) },
+
+       {"FolderViewPopup/DeleteFolder",        NULL, N_("_Delete folder..."), NULL, NULL, G_CALLBACK(delete_folder_cb) },
+
+       {"FolderViewPopup/Synchronise",         NULL, N_("Synchronise"), NULL, NULL, G_CALLBACK(sync_cb) },
+       {"FolderViewPopup/DownloadMessages",    NULL, N_("Down_load messages"), NULL, NULL, G_CALLBACK(download_cb) },
 
-static void new_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
-static void rename_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
-static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
-static void delete_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
-static void update_tree_cb(FolderView *folderview, guint action, GtkWidget *widget);
-static void download_cb(FolderView *folderview, guint action, GtkWidget *widget);
-static void sync_cb(FolderView *folderview, guint action, GtkWidget *widget);
-static void subscribed_cb(FolderView *folderview, guint action, GtkWidget *widget);
-static void subscribe_cb(FolderView *folderview, guint action, GtkWidget *widget);
-
-static GtkItemFactoryEntry imap_popup_entries[] =
+
+       {"FolderViewPopup/Subscriptions",       NULL, N_("S_ubscriptions") },
+       {"FolderViewPopup/Subscriptions/---",   NULL, "---", NULL, NULL, NULL }, 
+       {"FolderViewPopup/Subscriptions/Subscribe",     NULL, N_("_Subscribe..."), NULL, NULL, G_CALLBACK(subscribe_cb) },
+       {"FolderViewPopup/Subscriptions/Unsubscribe",   NULL, N_("_Unsubscribe..."), NULL, NULL, G_CALLBACK(unsubscribe_cb) },
+
+       {"FolderViewPopup/CheckNewMessages",    NULL, N_("_Check for new messages"), NULL, NULL, G_CALLBACK(update_tree_cb) }, /*0*/
+       {"FolderViewPopup/CheckNewFolders",     NULL, N_("C_heck for new folders"), NULL, NULL, G_CALLBACK(update_tree_cb) }, /*1*/
+       {"FolderViewPopup/RebuildTree",         NULL, N_("R_ebuild folder tree"), NULL, NULL, G_CALLBACK(update_tree_cb) }, /*2*/
+};
+
+static GtkToggleActionEntry imap_toggle_popup_entries[] =
 {
-       {N_("/Create _new folder..."),   NULL, new_folder_cb,    0, NULL},
-       {"/---",                         NULL, NULL,             0, "<Separator>"},
-       {N_("/_Rename folder..."),       NULL, rename_folder_cb, 0, NULL},
-       {N_("/M_ove folder..."),         NULL, move_folder_cb,   0, NULL},
-       {N_("/Cop_y folder..."),         NULL, move_folder_cb,   1, NULL},
-       {"/---",                         NULL, NULL,             0, "<Separator>"},
-       {N_("/_Delete folder..."),       NULL, delete_folder_cb, 0, NULL},
-       {"/---",                         NULL, NULL,             0, "<Separator>"},
-       {N_("/_Synchronise"),            NULL, sync_cb,          0, NULL},
-       {N_("/Down_load messages"),      NULL, download_cb,      0, NULL},
-       {"/---",                         NULL, NULL,             0, "<Separator>"},
-       {N_("/S_ubscriptions"),          NULL, NULL,             0, "<Branch>"},
-       {N_("/Subscriptions/Show only subscribed _folders"),    
-                                        NULL, subscribed_cb,    0, "<ToggleItem>"},
-       {N_("/Subscriptions/---"),       NULL, NULL,             0, "<Separator>"},
-       {N_("/Subscriptions/_Subscribe..."),NULL, subscribe_cb,          1, NULL},
-       {N_("/Subscriptions/_Unsubscribe..."),    
-                                        NULL, subscribe_cb,     0, NULL},
-       {"/---",                         NULL, NULL,             0, "<Separator>"},
-       {N_("/_Check for new messages"), NULL, update_tree_cb,   0, NULL},
-       {N_("/C_heck for new folders"),  NULL, update_tree_cb,   1, NULL},
-       {N_("/R_ebuild folder tree"),    NULL, update_tree_cb,   2, NULL},
-       {"/---",                         NULL, NULL,             0, "<Separator>"},
+       {"FolderViewPopup/Subscriptions/ShowOnlySubs",  NULL, N_("Show only subscribed _folders"), NULL, NULL, G_CALLBACK(subscribed_cb) }, 
 };
 
-static void set_sensitivity(GtkItemFactory *factory, FolderItem *item);
+static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item);
+static void add_menuitems(GtkUIManager *ui_manager, FolderItem *item);
 
 static FolderViewPopup imap_popup =
 {
        "imap",
        "<IMAPFolder>",
-       NULL,
+       imap_popup_entries,
+       G_N_ELEMENTS(imap_popup_entries),
+       imap_toggle_popup_entries,
+       G_N_ELEMENTS(imap_toggle_popup_entries),
+       NULL, 0, 0, NULL,
+       add_menuitems,
        set_sensitivity
 };
 
 void imap_gtk_init(void)
 {
-       guint i, n_entries;
-
-       n_entries = sizeof(imap_popup_entries) /
-               sizeof(imap_popup_entries[0]);
-       for (i = 0; i < n_entries; i++)
-               imap_popup.entries = g_slist_append(imap_popup.entries, &imap_popup_entries[i]);
-
        folderview_register_popup(&imap_popup);
 }
 
-static void set_sensitivity(GtkItemFactory *factory, FolderItem *item)
+static void add_menuitems(GtkUIManager *ui_manager, FolderItem *item)
+{
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "CreateNewFolder", "FolderViewPopup/CreateNewFolder", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "SeparatorIMAP1", "FolderViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "RenameFolder", "FolderViewPopup/RenameFolder", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "MoveFolder", "FolderViewPopup/MoveFolder", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "CopyFolder", "FolderViewPopup/CopyFolder", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "SeparatorIMAP2", "FolderViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "DeleteFolder", "FolderViewPopup/DeleteFolder", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "SeparatorIMAP3", "FolderViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "Synchronise", "FolderViewPopup/Synchronise", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "DownloadMessages", "FolderViewPopup/DownloadMessages", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "SeparatorIMAP4", "FolderViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "Subscriptions", "FolderViewPopup/Subscriptions", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup/Subscriptions", "ShowOnlySubs", "FolderViewPopup/Subscriptions/ShowOnlySubs", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup/Subscriptions", "SeparatorIMAP5", "FolderViewPopup/Subscriptions/---", GTK_UI_MANAGER_SEPARATOR)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup/Subscriptions", "Subscribe", "FolderViewPopup/Subscriptions/Subscribe", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup/Subscriptions", "Unsubscribe", "FolderViewPopup/Subscriptions/Unsubscribe", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "CheckNewMessages", "FolderViewPopup/CheckNewMessages", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "CheckNewFolders", "FolderViewPopup/CheckNewFolders", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "RebuildTree", "FolderViewPopup/RebuildTree", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(ui_manager, "/Popup/FolderViewPopup", "SeparatorIMAP6", "FolderViewPopup/---", GTK_UI_MANAGER_SEPARATOR)
+}
+
+static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
 {
        gboolean folder_is_normal = 
                        item != NULL &&
@@ -113,33 +143,39 @@ static void set_sensitivity(GtkItemFactory *factory, FolderItem *item)
                        !folder_has_parent_of_type(item, F_TRASH);
 
 #define SET_SENS(name, sens) \
-       menu_set_sensitive(factory, name, sens)
-
-       SET_SENS("/Create new folder...",   item->no_sub == FALSE);
-       SET_SENS("/Rename folder...",       item->stype == F_NORMAL && folder_item_parent(item) != NULL);
-       SET_SENS("/Move folder...",         folder_is_normal && folder_item_parent(item) != NULL);
-       SET_SENS("/Delete folder...",       item->stype == F_NORMAL && folder_item_parent(item) != NULL);
-
-       SET_SENS("/Synchronise",            item ? (folder_item_parent(item) == NULL && folder_want_synchronise(item->folder))
-                                               : FALSE);
-       SET_SENS("/Check for new messages", folder_item_parent(item) == NULL);
-       SET_SENS("/Check for new folders",  folder_item_parent(item) == NULL);
-       SET_SENS("/Rebuild folder tree",    folder_item_parent(item) == NULL);
+       cm_menu_set_sensitive_full(ui_manager, "Popup/"name, sens)
+
+       SET_SENS("FolderViewPopup/CreateNewFolder",   item && item->no_sub == FALSE);
+       SET_SENS("FolderViewPopup/RenameFolder",       item && item->stype == F_NORMAL && folder_item_parent(item) != NULL);
+       SET_SENS("FolderViewPopup/MoveFolder",      item && folder_is_normal && folder_item_parent(item) != NULL);
+       SET_SENS("FolderViewPopup/DeleteFolder",            item && item->stype == F_NORMAL && folder_item_parent(item) != NULL);
+
+       SET_SENS("FolderViewPopup/CheckNewMessages", folder_item_parent(item) == NULL);
+       SET_SENS("FolderViewPopup/CheckNewFolders",  folder_item_parent(item) == NULL);
+       SET_SENS("FolderViewPopup/RebuildTree",    folder_item_parent(item) == NULL);
+
+       SET_SENS("FolderViewPopup/Synchronise",    
+                       item ? (folder_item_parent(item) != NULL
+                       && folder_want_synchronise(item->folder))
+                       : FALSE);
+       SET_SENS("FolderViewPopup/DownloadMessages", item && !item->no_select);
+
+       SET_SENS("FolderViewPopup/CheckNewMessages", folder_item_parent(item) == NULL);
+       SET_SENS("FolderViewPopup/CheckNewFolders",  folder_item_parent(item) == NULL);
+       SET_SENS("FolderViewPopup/RebuildTree",    folder_item_parent(item) == NULL);
        
-       SET_SENS("/Subscriptions/Unsubscribe...",    item->stype == F_NORMAL && folder_item_parent(item) != NULL);
-       SET_SENS("/Subscriptions/Subscribe...",    TRUE);
-       if (item->folder && item->folder->account)
-               menu_set_active(factory, 
-                       "/Subscriptions/Show only subscribed folders", 
+       SET_SENS("FolderViewPopup/Subscriptions/Unsubscribe",    item && item->stype == F_NORMAL && folder_item_parent(item) != NULL);
+       SET_SENS("FolderViewPopup/Subscriptions/Subscribe",    TRUE);
+       if (item && item->folder && item->folder->account)
+               cm_toggle_menu_set_active_full(ui_manager, "Popup/FolderViewPopup/Subscriptions/ShowOnlySubs",
                        item->folder->account->imap_subsonly);
 
 #undef SET_SENS
 }
 
-static void new_folder_cb(FolderView *folderview, guint action,
-                         GtkWidget *widget)
+static void new_folder_cb(GtkAction *action, gpointer data)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderView *folderview = (FolderView *)data;
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
@@ -147,19 +183,21 @@ static void new_folder_cb(FolderView *folderview, guint action,
        gchar *p;
        gchar separator = '/';
        
-       if (!folderview->selected) return;
+       if ((item = folderview_get_selected_item(folderview)) == NULL) 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->account != NULL);
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item->folder->account != NULL);
 
-       new_folder = input_dialog
+       new_folder = input_dialog_with_checkbtn
                (_("New folder"),
                 _("Input the name of new folder:\n"
                   "(if you want to create a folder to store subfolders\n"
                   "only and no mail, append '/' to the folder name)"),
-                _("NewFolder"));
+                _("NewFolder"),
+                _("Inherit properties from parent folder"),
+                &(prefs_common.inherit_folder_props));
+
        if (!new_folder) return;
        AUTORELEASE_STR(new_folder, {g_free(new_folder); return;});
 
@@ -192,26 +230,30 @@ static void new_folder_cb(FolderView *folderview, guint action,
                alertpanel_error(_("Can't create the folder '%s'."), name);
                return;
        }
+
+       if (prefs_common.inherit_folder_props) {
+               folder_item_prefs_copy_prefs(item, new_item);
+       }
+
        folder_write_list();
 }
 
-static void rename_folder_cb(FolderView *folderview, guint action,
-                            GtkWidget *widget)
+static void rename_folder_cb(GtkAction *action, gpointer data)
 {
+       FolderView *folderview = (FolderView *)data;
        FolderItem *item;
        gchar *new_folder;
        gchar *name;
        gchar *message;
-       gchar *old_path;
        gchar *old_id;
        gchar *new_id;
        gchar *base;
        gchar separator = '/';
 
        item = folderview_get_selected_item(folderview);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->path != NULL);
-       g_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(item->path != NULL);
+       cm_return_if_fail(item->folder != NULL);
 
        name = trim_string(item->name, 32);
        message = g_strdup_printf(_("Input new name for '%s':"), name);
@@ -230,7 +272,7 @@ static void rename_folder_cb(FolderView *folderview, guint action,
                return;
        }
        if (strchr(new_folder, '/') != NULL) {
-               alertpanel_error(_("`%c' can't be included in folder name."),
+               alertpanel_error(_("'%c' can't be included in folder name."),
                                 '/');
                return;
        }
@@ -242,8 +284,6 @@ static void rename_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
-
        old_id = folder_item_get_identifier(item);
        
        if (folder_item_rename(item, new_folder) < 0) {
@@ -256,7 +296,7 @@ static void rename_folder_cb(FolderView *folderview, guint action,
        new_id = folder_item_get_identifier(item);
        prefs_filtering_rename_path(old_id, new_id);
        account_rename_path(old_id, new_id);
-
+       prefs_actions_rename_path(old_id, new_id);
        g_free(old_id);
        g_free(new_id);
 
@@ -264,37 +304,52 @@ static void rename_folder_cb(FolderView *folderview, guint action,
        folder_write_list();
 }
 
-static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widget)
+static void move_folder_cb(GtkAction *action, gpointer data)
 {
+       FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;
 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != imap_get_class())
                return;
 
-       to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, TRUE);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE);
        if (!to_folder)
                return;
        
-       folderview_move_folder(folderview, from_folder, to_folder, action);
+       folderview_move_folder(folderview, from_folder, to_folder, 0);
 }
 
-static void delete_folder_cb(FolderView *folderview, guint action,
-                            GtkWidget *widget)
+static void copy_folder_cb(GtkAction *action, gpointer data)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item;
+       FolderView *folderview = (FolderView *)data;
+       FolderItem *from_folder = NULL, *to_folder = NULL;
+
+       from_folder = folderview_get_selected_item(folderview);
+       if (!from_folder || from_folder->folder->klass != imap_get_class())
+               return;
+
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE);
+       if (!to_folder)
+               return;
+       
+       folderview_move_folder(folderview, from_folder, to_folder, 1);
+}
+
+static void delete_folder_cb(GtkAction *action, gpointer data)
+{
+       FolderView *folderview = (FolderView *)data;
+       FolderItem *item, *opened;
        gchar *message, *name;
        AlertValue avalue;
-       gchar *old_path;
        gchar *old_id;
 
-       if (!folderview->selected) return;
+       if ((item = folderview_get_selected_item(folderview)) == NULL) return;
+       opened = folderview_get_opened_item(folderview);
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->path != NULL);
-       g_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(item->path != NULL);
+       cm_return_if_fail(item->folder != NULL);
 
        name = trim_string(item->name, 32);
        AUTORELEASE_STR(name, {g_free(name); return;});
@@ -308,15 +363,12 @@ static void delete_folder_cb(FolderView *folderview, guint action,
        g_free(message);
        if (avalue != G_ALERTALTERNATE) return;
 
-       Xstrdup_a(old_path, item->path, return);
        old_id = folder_item_get_identifier(item);
 
-       if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
-                                 folderview->selected,
-                                 folderview->opened)) {
+       if (item == opened ||
+                       folder_is_child_of(item, opened)) {
                summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
+               folderview_close_opened(folderview, TRUE);
        }
 
        if (item->folder->klass->remove_folder(item->folder, item) < 0) {
@@ -333,33 +385,33 @@ static void delete_folder_cb(FolderView *folderview, guint action,
 
 }
 
-static void update_tree_cb(FolderView *folderview, guint action,
-                          GtkWidget *widget)
+#define DO_ACTION(name, act)   { if (!strcmp(a_name, name)) act; }
+
+static void update_tree_cb(GtkAction *action, gpointer data)
 {
+       FolderView *folderview = (FolderView *)data;
        FolderItem *item;
+       const gchar *a_name = gtk_action_get_name(action);
 
        item = folderview_get_selected_item(folderview);
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(item != NULL);
 
        summary_show(folderview->summaryview, NULL);
 
-       g_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item->folder != NULL);
 
-       if (action == 0)
-               folderview_check_new(item->folder);
-       else if (action == 1)
-               folderview_rescan_tree(item->folder, FALSE);
-       else if (action == 2)
-               folderview_rescan_tree(item->folder, TRUE);
+       DO_ACTION("FolderViewPopup/CheckNewMessages", folderview_check_new(item->folder));
+       DO_ACTION("FolderViewPopup/CheckNewFolders", folderview_rescan_tree(item->folder, FALSE));
+       DO_ACTION("FolderViewPopup/RebuildTree", folderview_rescan_tree(item->folder, TRUE));
 }
 
-static void sync_cb(FolderView *folderview, guint action,
-                          GtkWidget *widget)
+static void sync_cb(GtkAction *action, gpointer data)
 {
+       FolderView *folderview = (FolderView *)data;
        FolderItem *item;
 
        item = folderview_get_selected_item(folderview);
-       g_return_if_fail(item != NULL);
+       cm_return_if_fail(item != NULL);
        folder_synchronise(item->folder);
 }
 
@@ -368,8 +420,8 @@ void imap_gtk_synchronise(FolderItem *item, gint days)
        MainWindow *mainwin = mainwindow_get_mainwindow();
        FolderView *folderview = mainwin->folderview;
        
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
+       cm_return_if_fail(item != NULL);
+       cm_return_if_fail(item->folder != NULL);
 
        main_window_cursor_wait(mainwin);
        inc_lock();
@@ -424,21 +476,16 @@ static gboolean imap_gtk_subscribe_func(GNode *node, gpointer data)
        return FALSE;
 }
 
-static void subscribe_cb(FolderView *folderview, guint action,
-                          GtkWidget *widget)
+static void subscribe_cb_full(FolderView *folderview, guint action)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
        gchar *message, *name;
        AlertValue avalue;
        GtkWidget *rec_chk;
        gboolean recurse = FALSE;
 
-       if (!folderview->selected) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
+       if ((item = folderview_get_selected_item(folderview)) == NULL) return;
+       cm_return_if_fail(item->folder != NULL);
 
        name = trim_string(item->name, 32);
        AUTORELEASE_STR(name, {g_free(name); return;});
@@ -457,8 +504,8 @@ static void subscribe_cb(FolderView *folderview, guint action,
                                G_CALLBACK(chk_update_val), &recurse);
 
                avalue = alertpanel_full(_("Subscriptions"), message,
-                                        GTK_STOCK_CANCEL, _("+_Search"), NULL, FALSE,
-                                        rec_chk, ALERT_QUESTION, G_ALERTDEFAULT);
+                                        GTK_STOCK_CANCEL, g_strconcat("+", _("_Search"), NULL),
+                                        NULL, FALSE, rec_chk, ALERT_QUESTION, G_ALERTDEFAULT);
                g_free(message);
                if (avalue != G_ALERTALTERNATE) return;
                
@@ -475,7 +522,9 @@ static void subscribe_cb(FolderView *folderview, guint action,
                                transc_list = g_list_append(transc_list, 
                                        imap_modified_utf7_to_utf8(cur->data, FALSE));
                        }
-
+                       
+                       transc_list = g_list_sort(transc_list, g_str_equal);
+                       
                        child_folder = input_dialog_combo(_("Subscribe"), 
                                        msg,
                                        transc_list->next?_("All of them"):transc_list->data, transc_list);
@@ -494,7 +543,7 @@ static void subscribe_cb(FolderView *folderview, guint action,
                        for (cur = transc_list; cur; cur = cur->next) 
                                g_free((gchar *)cur->data);
                        if (r == 0)
-                               folderview_fast_rescan_tree(item->folder);
+                               folderview_rescan_tree(item->folder, FALSE);
                } else {
                        alertpanel_notice(_("This folder is already subscribed and "
                                  "has no unsubscribed subfolders.\n\nIf there are new folders, "
@@ -514,19 +563,19 @@ static void subscribe_cb(FolderView *folderview, guint action,
                        G_CALLBACK(chk_update_val), &recurse);
 
        avalue = alertpanel_full(_("Subscriptions"), message,
-                                GTK_STOCK_CANCEL, action?_("+_Subscribe"):_("+_Unsubscribe"), NULL, FALSE,
+                                GTK_STOCK_CANCEL, action?g_strconcat("+", _("_Subscribe"), NULL):
+                                g_strconcat("+", _("_Unsubscribe"), NULL), NULL, FALSE,
                                 rec_chk, ALERT_QUESTION, G_ALERTDEFAULT);
        g_free(message);
        if (avalue != G_ALERTALTERNATE) return;
        
-       
+       FolderItem *opened = folderview_get_opened_item(folderview);
+       FolderItem *selected = folderview_get_selected_item(folderview);
        if (!action) {
-               if (folderview->opened == folderview->selected ||
-                   gtk_ctree_is_ancestor(ctree,
-                                         folderview->selected,
-                                         folderview->opened)) {
+               if (opened == selected ||
+                               folder_is_child_of(selected, opened)) {
                        summary_clear_all(folderview->summaryview);
-                       folderview->opened = NULL;
+                       folderview_close_opened(folderview, TRUE);
                }
        }
 
@@ -538,40 +587,46 @@ static void subscribe_cb(FolderView *folderview, guint action,
        }
 
        if (!action && item->folder->account->imap_subsonly)
-               folderview_fast_rescan_tree(item->folder);
+               folderview_rescan_tree(item->folder, FALSE);
+}
+
+static void subscribe_cb(GtkAction *action, gpointer data)
+{
+       subscribe_cb_full((FolderView *)data, 1);
+}
+
+static void unsubscribe_cb(GtkAction *action, gpointer data)
+{
+       subscribe_cb_full((FolderView *)data, 0);
 }
 
-static void subscribed_cb(FolderView *folderview, guint action,
-                          GtkWidget *widget)
+static void subscribed_cb(GtkAction *action, gpointer data)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       FolderView *folderview = (FolderView *)data;
+       FolderItem *item = folderview_get_selected_item(folderview);
+       FolderItem *opened = folderview_get_opened_item(folderview);
        
        if (!item || !item->folder || !item->folder->account)
                return;
-       if (item->folder->account->imap_subsonly == GTK_CHECK_MENU_ITEM(widget)->active)
+       if (item->folder->account->imap_subsonly == gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
                return;
 
-       if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
-                                 folderview->selected,
-                                 folderview->opened)) {
+       if (opened == item ||
+                       folder_is_child_of(item, opened)) {
                summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
+               folderview_close_opened(folderview, TRUE);
        }
 
-       item->folder->account->imap_subsonly = GTK_CHECK_MENU_ITEM(widget)->active;
-       folderview_fast_rescan_tree(item->folder);
+       item->folder->account->imap_subsonly = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+       folderview_rescan_tree(item->folder, FALSE);
 }
 
-static void download_cb(FolderView *folderview, guint action,
-                       GtkWidget *widget)
+static void download_cb(GtkAction *action, gpointer data)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderView *folderview = (FolderView *)data;
        FolderItem *item;
 
-       if (!folderview->selected) return;
-
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       if ((item = folderview_get_selected_item(folderview)) == NULL)
+               return;
        imap_gtk_synchronise(item, 0);
 }