[Commits] [SCM] claws branch, master, updated. 3.17.0-138-g1fef5ee

[claws at claws-mail.org]

The branch, master has been updated
       via  1fef5ee2e6f68d025048cd43a0ae26bd8e85c28e (commit)
      from  f3e983117a19000ad623f2c6f44bb8d3dfb3df03 (commit)

Summary of changes:
 src/compose.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 1fef5ee2e6f68d025048cd43a0ae26bd8e85c28e
Author: Paul <paul at claws-mail.org>
Date:   Fri Oct 26 13:38:19 2018 +0100

    only show warning about privacy system 'none' on replies to signed or encrypted msgs

diff --git a/src/compose.c b/src/compose.c
index e6d9497..487ec1c 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1692,7 +1692,8 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
 	g_free(s_system);
 
 	if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
-	    (account->default_encrypt_reply || account->default_sign_reply))
+	    ((account->default_encrypt_reply && MSG_IS_ENCRYPTED(compose->replyinfo->flags)) ||
+	     (account->default_sign_reply && MSG_IS_SIGNED(compose->replyinfo->flags))))
 		alertpanel_error(_("You have opted to sign and/or encrypt this "
 				   "message but have not selected a privacy system.\n\n"
 				   "Signing and encrypting have been disabled for this "

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


hooks/post-receive
-- 
Claws Mail