[Commits] [SCM] claws branch, master, updated. 3.9.2-58-gbe0ad9c

[claws at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  be0ad9cdefda0bedceca7bea3ce4864314448102 (commit)
      from  de4c88036ebc8f471cdff4451674d6301889b68a (commit)


- Log -----------------------------------------------------------------
commit be0ad9cdefda0bedceca7bea3ce4864314448102
Author: Paul <paul at claws-mail.org>
Date:   Tue Aug 6 06:12:08 2013 +0100

    fix bug 2794, ' account privacy signing method ignored on reply'
    
    also apply the same logic to encrypting

diff --git a/src/compose.c b/src/compose.c
index 6b999b1..33c6281 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1285,12 +1285,11 @@ static void compose_force_encryption(Compose *compose, PrefsAccount *account,
 	if (override_pref == FALSE && account->default_encrypt_reply == FALSE)
 		return;
 
-	if (system)
-		privacy = system;
-	else if (account->default_privacy_system
-	&&  strlen(account->default_privacy_system)) {
+	if (account->default_privacy_system && strlen(account->default_privacy_system))
 		privacy = account->default_privacy_system;
-	} else {
+	else if (system)
+		privacy = system;
+	else {
 		GSList *privacy_avail = privacy_get_system_ids();
 		if (privacy_avail && g_slist_length(privacy_avail)) {
 			privacy = (gchar *)(privacy_avail->data);
@@ -1316,12 +1315,11 @@ static void compose_force_signing(Compose *compose, PrefsAccount *account, const
 {
 	const gchar *privacy = NULL;
 
-	if (system)
-		privacy = system;
-	else if (account->default_privacy_system
-	&&  strlen(account->default_privacy_system)) {
+	if (account->default_privacy_system && strlen(account->default_privacy_system))
 		privacy = account->default_privacy_system;
-	} else {
+	else if (system)
+		privacy = system;
+	else {
 		GSList *privacy_avail = privacy_get_system_ids();
 		if (privacy_avail && g_slist_length(privacy_avail)) {
 			privacy = (gchar *)(privacy_avail->data);

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

Summary of changes:
 src/compose.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Claws Mail