From 9c47b608f786d30faedb3d7984d27f2020f9d858 Mon Sep 17 00:00:00 2001 From: wwp Date: Mon, 12 Dec 2016 19:28:06 +0100 Subject: [PATCH] Fix missing items in summaryview's menu declarations. --- src/summaryview.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/summaryview.c b/src/summaryview.c index 4739b66c2..4757b1065 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -706,10 +706,11 @@ SummaryView *summary_create(MainWindow *mainwin) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Mark", "Message/Mark/Mark", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Unmark", "Message/Mark/Unmark", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator1", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) - MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkRead", "Message/Mark/MarkRead", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkAllRead", "Message/Mark/MarkAllRead", GTK_UI_MANAGER_MENUITEM) + MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkAllUnread", "Message/Mark/MarkAllUnread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator3", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "IgnoreThread", "Message/Mark/IgnoreThread", GTK_UI_MANAGER_MENUITEM) MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "UnignoreThread", "Message/Mark/UnignoreThread", GTK_UI_MANAGER_MENUITEM) @@ -1714,7 +1715,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview) gboolean sensitive; gint i; -#define N_ENTRIES 38 +#define N_ENTRIES 39 static struct { const gchar *entry; SensitiveCondMask cond; @@ -1750,15 +1751,16 @@ do { \ FILL_TABLE("Menus/SummaryViewPopup/Mark", M_TARGET_EXIST); FILL_TABLE("Menus/SummaryViewPopup/Mark/Mark", M_TARGET_EXIST); FILL_TABLE("Menus/SummaryViewPopup/Mark/Unmark", M_TARGET_EXIST); - FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkUnread", M_TARGET_EXIST); FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkRead", M_TARGET_EXIST); + FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkUnread", M_TARGET_EXIST); FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkAllRead", M_TARGET_EXIST); + FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkAllUnread", M_TARGET_EXIST); FILL_TABLE("Menus/SummaryViewPopup/Mark/IgnoreThread", M_TARGET_EXIST); FILL_TABLE("Menus/SummaryViewPopup/Mark/UnignoreThread", M_TARGET_EXIST); FILL_TABLE("Menus/SummaryViewPopup/Mark/WatchThread", M_TARGET_EXIST); FILL_TABLE("Menus/SummaryViewPopup/Mark/UnwatchThread", M_TARGET_EXIST); - FILL_TABLE("Menus/SummaryViewPopup/Mark/Unlock", M_TARGET_EXIST); FILL_TABLE("Menus/SummaryViewPopup/Mark/Lock", M_TARGET_EXIST); + FILL_TABLE("Menus/SummaryViewPopup/Mark/Unlock", M_TARGET_EXIST); FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM); FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM); FILL_TABLE("Menus/SummaryViewPopup/ColorLabel", M_TARGET_EXIST); -- 2.25.1