From 7ccd621021bb90f177021312ff4a55ce66bd2784 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 2 Oct 2019 10:53:48 +0100 Subject: [PATCH] no need to add M_DRAFT for context menu item 'Re-Edit', just use existing M_ALLOW_REEDIT instead --- src/mainwindow.c | 4 ---- src/mainwindow.h | 1 - src/summaryview.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/mainwindow.c b/src/mainwindow.c index 2c756b555..9001ba20d 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -3016,10 +3016,6 @@ SensitiveCondMask main_window_get_current_state(MainWindow *mainwin) && mainwin->summaryview->folder_item->stype != F_DRAFT) UPDATE_STATE(M_NOT_DRAFT); - if (mainwin->summaryview->folder_item && - mainwin->summaryview->folder_item->stype == F_DRAFT) - UPDATE_STATE(M_DRAFT); - if (prefs_common.actions_list && g_slist_length(prefs_common.actions_list)) UPDATE_STATE(M_ACTIONS_EXIST); diff --git a/src/mainwindow.h b/src/mainwindow.h index 0d1ffb14a..ce0b30cac 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -70,7 +70,6 @@ typedef enum M_HAVE_RETRIEVABLE_ACCOUNT, M_HAVE_ANY_RETRIEVABLE_ACCOUNT, M_NOT_DRAFT, - M_DRAFT, /* reserved */ M_MAX_RESERVED diff --git a/src/summaryview.c b/src/summaryview.c index 869e9eba1..1036bfe20 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -1827,7 +1827,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview) (const gchar *) entry_str, \ ((cond & state) == cond)); \ } - SET_SENSITIVE("Menus/SummaryViewPopup/Reedit", M_TARGET_EXIST, M_DRAFT); + SET_SENSITIVE("Menus/SummaryViewPopup/Reedit", M_ALLOW_REEDIT); SET_SENSITIVE("Menus/SummaryViewPopup/Reply", M_HAVE_ACCOUNT, M_TARGET_EXIST); #ifndef GENERIC_UMPC SET_SENSITIVE("Menus/SummaryViewPopup/ReplyTo", M_HAVE_ACCOUNT, M_TARGET_EXIST); -- 2.25.1