no need to add M_DRAFT for context menu item 'Re-Edit', just use existing M_ALLOW_REE...
authorPaul <paul@claws-mail.org>
Wed, 2 Oct 2019 09:53:48 +0000 (10:53 +0100)
committerPaul <paul@claws-mail.org>
Wed, 2 Oct 2019 09:53:48 +0000 (10:53 +0100)
src/mainwindow.c
src/mainwindow.h
src/summaryview.c

index 2c756b5..9001ba2 100644 (file)
@@ -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);
 
index 0d1ffb1..ce0b30c 100644 (file)
@@ -70,7 +70,6 @@ typedef enum
        M_HAVE_RETRIEVABLE_ACCOUNT,
        M_HAVE_ANY_RETRIEVABLE_ACCOUNT,
        M_NOT_DRAFT,
-       M_DRAFT,
 
 /* reserved */
     M_MAX_RESERVED
index 869e9eb..1036bfe 100644 (file)
@@ -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);