[Commits] [SCM] claws branch, master, updated. 3.17.4-38-g7ccd62102

[paul at claws-mail.org]

The branch, master has been updated
       via  7ccd621021bb90f177021312ff4a55ce66bd2784 (commit)
      from  a526809ae1887370d86a34a087f37c2776e3125f (commit)

Summary of changes:
 src/mainwindow.c  | 4 ----
 src/mainwindow.h  | 1 -
 src/summaryview.c | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 7ccd621021bb90f177021312ff4a55ce66bd2784
Author: Paul <paul at claws-mail.org>
Date:   Wed Oct 2 10:53:48 2019 +0100

    no need to add M_DRAFT for context menu item 'Re-Edit', just use existing M_ALLOW_REEDIT instead

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);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail