From: Paul <paul@claws-mail.org>
Date: Sat, 11 Jul 2020 08:41:20 +0000 (+0100)
Subject: when redirecting make encrypt and sign buttons inactive, and don't care about folder... 
X-Git-Tag: 3.17.6~5
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=762988d1ac56d5f4b4b3bbd958f3ac4b6dc53725;hp=859ba3ef4b86f13f119d25e61043f93cf4c97a22

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 4f7f08a38..748800c07 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -2520,7 +2520,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;
 
@@ -2598,6 +2597,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);