{"File/AddMailbox/MH", NULL, N_("MH..."), NULL, NULL, G_CALLBACK(add_mailbox_cb) },
{"File/---", NULL, "---" },
- {"File/SortFolders", NULL, N_("Change folder order..."), NULL, NULL, G_CALLBACK(foldersort_cb) },
+ {"File/SortMailboxes", NULL, N_("Change mailbox order..."), NULL, NULL, G_CALLBACK(foldersort_cb) },
/* {"File/---", NULL, "---" }, */
{"File/ImportMbox", NULL, N_("_Import mbox file..."), NULL, NULL, G_CALLBACK(import_mbox_cb) },
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "AddMailbox", "File/AddMailbox", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File/AddMailbox", "MH", "File/AddMailbox/MH", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "Separator1", "File/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "SortFolders", "File/SortFolders", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "SortMailboxes", "File/SortMailboxes", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "Separator2", "File/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "ImportMbox", "File/ImportMbox", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "ExportMbox", "File/ExportMbox", GTK_UI_MANAGER_MENUITEM)
gtk_widget_show_all(hbox_stat);
gtk_widget_hide(offline_switch);
+ gtk_widget_hide(progressbar);
gtk_widget_hide(warning_btn);
#else
online_switch = gtk_button_new ();
state |= M_NEWS;
else
state |= M_NOT_NEWS;
+ if (mainwin->summaryview->folder_item &&
+ (mainwin->summaryview->folder_item->stype != F_TRASH ||
+ !folder_has_parent_of_type(mainwin->summaryview->folder_item, F_TRASH)))
+ state |= M_NOT_TRASH;
+
if (prefs_common.actions_list && g_slist_length(prefs_common.actions_list))
state |= M_ACTIONS_EXIST;
{"Menu/Message/Forward" , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
{"Menu/Message/ForwardAtt" , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
{"Menu/Message/Redirect" , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
- {"Menu/Message/Move" , M_TARGET_EXIST|M_ALLOW_DELETE},
+ {"Menu/Message/Move" , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
{"Menu/Message/Copy" , M_TARGET_EXIST|M_EXEC},
- {"Menu/Message/Trash" , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
+ {"Menu/Message/Trash" , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS|M_NOT_TRASH},
{"Menu/Message/Delete" , M_TARGET_EXIST|M_ALLOW_DELETE},
{"Menu/Message/CancelNews" , M_TARGET_EXIST|M_ALLOW_DELETE|M_NEWS},
{"Menu/Message/Mark" , M_TARGET_EXIST|M_SUMMARY_ISLIST},
if (first_start) {
#ifdef G_OS_UNIX
gtk_window_deiconify(GTK_WINDOW(mainwin->window));
- gtkut_window_popup(mainwin->window);
#endif
first_start = FALSE;
} else {