{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_rm_imap_folder_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Check for new messages"),
NULL, folderview_update_tree_cb, 0, NULL},
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;
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));