[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-972-g810f7aef4

[paul at claws-mail.org]

The branch, gtk3 has been updated
       via  810f7aef49ccf533a2d4a1cf52cb9d898bb96f34 (commit)
       via  98c51cd19064148f9b1bbef2fd02f30a6bf7f4ef (commit)
      from  51b1ddd8b8e2a5dddcba722411caf7d03265ce78 (commit)

Summary of changes:
 src/compose.c | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit 810f7aef49ccf533a2d4a1cf52cb9d898bb96f34
Author: Paul <paul at claws-mail.org>
Date:   Sat Jul 11 09:43:57 2020 +0100

    warn about privacy system 'none' and auto sign/encrypt being enabled in all applicable scenarios

diff --git a/src/compose.c b/src/compose.c
index 532a8f04d..a1e08bc80 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -194,6 +194,13 @@ typedef enum {
 #define COMPOSE_DRAFT_TIMEOUT_UNSET -1
 #define COMPOSE_DRAFT_TIMEOUT_FORBIDDEN -2
 
+#define COMPOSE_PRIVACY_WARNING() {							\
+	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 "	\
+			   "message."));						\
+}
+
 static GdkRGBA default_header_bgcolor =
 	{0, 0, 0, 1};
 
@@ -997,10 +1004,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
 
 	if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
 	    (account->default_encrypt || account->default_sign))
-		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 "
-				   "message."));
+		COMPOSE_PRIVACY_WARNING();
 
 	/* override from name if mailto asked for it */
 	if (mailto_from) {
@@ -1679,12 +1683,10 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
 	g_free(s_system);
 
 	if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
-	    ((account->default_encrypt_reply && MSG_IS_ENCRYPTED(compose->replyinfo->flags)) ||
+	    ((account->default_encrypt || account->default_sign) ||
+	     (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 "
-				   "message."));
+		COMPOSE_PRIVACY_WARNING();
 
 	SIGNAL_BLOCK(textbuf);
 	
@@ -1891,6 +1893,10 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
 #endif
 	SIGNAL_UNBLOCK(textbuf);
 	
+	if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
+	    (account->default_encrypt || account->default_sign))
+		COMPOSE_PRIVACY_WARNING();
+
 	cursor_pos = quote_fmt_get_cursor_pos();
 	if (cursor_pos == -1)
 		gtk_widget_grab_focus(compose->header_last->entry);
@@ -1974,6 +1980,9 @@ static Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_
 
 	compose = compose_create(account, ((MsgInfo *)msginfo_list->data)->folder, COMPOSE_FORWARD, FALSE);
 	compose_apply_folder_privacy_settings(compose, ((MsgInfo *)msginfo_list->data)->folder);
+	if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
+	    (account->default_encrypt || account->default_sign))
+		COMPOSE_PRIVACY_WARNING();
 
 	compose->updating = TRUE;
 
@@ -2386,6 +2395,9 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
 		compose_activate_privacy_system(compose, account, FALSE);
 	}
 	compose_apply_folder_privacy_settings(compose, msginfo->folder);
+	if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
+	    (account->default_encrypt || account->default_sign))
+		COMPOSE_PRIVACY_WARNING();
 
 	compose->targetinfo = procmsg_msginfo_copy(msginfo);
 	compose->targetinfo->tags = g_slist_copy(msginfo->tags);

commit 98c51cd19064148f9b1bbef2fd02f30a6bf7f4ef
Author: Paul <paul at claws-mail.org>
Date:   Sat Jul 11 09:41:20 2020 +0100

    when redirecting make encrypt and sign buttons inactive, and don't care about folder privacy settings

diff --git a/src/compose.c b/src/compose.c
index 1558e84f1..532a8f04d 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2516,7 +2516,6 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
 	cm_return_val_if_fail(account != NULL, NULL);
 
 	compose = compose_create(account, msginfo->folder, COMPOSE_REDIRECT, batch);
-	compose_apply_folder_privacy_settings(compose, msginfo->folder);
 
 	compose->updating = TRUE;
 
@@ -2594,6 +2593,10 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
 		gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
 	if (compose->toolbar->linewrap_all_btn)
 		gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
+	if (compose->toolbar->privacy_sign_btn)
+		gtk_widget_set_sensitive(compose->toolbar->privacy_sign_btn, FALSE);
+	if (compose->toolbar->privacy_encrypt_btn)
+		gtk_widget_set_sensitive(compose->toolbar->privacy_encrypt_btn, FALSE);
 
 	compose->modified = FALSE;
 	compose_set_title(compose);

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


hooks/post-receive
-- 
Claws Mail