[Commits] [SCM] claws branch, master, updated. 3.14.1-34-gf37bbde

[claws at claws-mail.org]

The branch, master has been updated
       via  f37bbdecf9791f5b427e16e7951df766de1034e6 (commit)
      from  5f607a33a7ca9a9b0311e3afd7fca2729642b838 (commit)

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


- Log -----------------------------------------------------------------
commit f37bbdecf9791f5b427e16e7951df766de1034e6
Author: Paul <paul at claws-mail.org>
Date:   Sun Dec 11 17:44:32 2016 +0000

    some more colouring based on folder prefs override

diff --git a/src/compose.c b/src/compose.c
index 3e89d66..65c447a 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -3237,15 +3237,21 @@ static void compose_set_folder_prefs(Compose *compose, FolderItem *folder,
 					COMPOSE_TO, PREF_FOLDER);
 		compose_entry_mark_default_to(compose, folder->prefs->default_to);
 	}
-	if (folder->prefs->enable_default_cc)
+	if (folder->prefs->enable_default_cc) {
 		compose_entry_append(compose, folder->prefs->default_cc,
 					COMPOSE_CC, PREF_FOLDER);
-	if (folder->prefs->enable_default_bcc)
+		compose_entry_mark_default_to(compose, folder->prefs->default_cc);
+	}
+	if (folder->prefs->enable_default_bcc) {
 		compose_entry_append(compose, folder->prefs->default_bcc,
 					COMPOSE_BCC, PREF_FOLDER);
-	if (folder->prefs->enable_default_replyto)
+		compose_entry_mark_default_to(compose, folder->prefs->default_bcc);
+	}
+	if (folder->prefs->enable_default_replyto) {
 		compose_entry_append(compose, folder->prefs->default_replyto,
 					COMPOSE_REPLYTO, PREF_FOLDER);
+		compose_entry_mark_default_to(compose, folder->prefs->default_replyto);
+	}
 }
 
 static void compose_reply_set_subject(Compose *compose, MsgInfo *msginfo)

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


hooks/post-receive
-- 
Claws Mail