talons

commit 6469d5311aae1b83485589e91ab40afad51bd63c
parent 253b35157ac94a93ae05d981103aa7f927e106c5
Author: Paul <paul@claws-mail.org>
Date:   Thu, 20 Mar 2014 08:46:38 +0000

don't reply to self when doing reply to all

Diffstat:
M
src/compose.c
 | 
18
++++++++++--------

1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/compose.c b/src/compose.c
@@ -3282,16 +3282,18 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
 			gchar *tmp1 = NULL;
 			if (!msginfo->from)
 				return;
-			Xstrdup_a(tmp1, msginfo->from, return);
-			extract_address(tmp1);
-			if (to_all || to_sender ||
-			    !account_find_from_address(tmp1, FALSE))
+			if (to_sender)
+				compose_entry_append(compose, msginfo->from,
+						     COMPOSE_TO, PREF_NONE);
+			else if (to_all) {
+				Xstrdup_a(tmp1, msginfo->from, return);
+				extract_address(tmp1);
 				compose_entry_append(compose,
-				 (compose->replyto && !to_sender)
-					  ? compose->replyto :
-					  msginfo->from ? msginfo->from : "",
+				 (!account_find_from_address(tmp1, FALSE))
+					  ? msginfo->from :
+					  msginfo->to,
 					  COMPOSE_TO, PREF_NONE);
-			else if (!to_all && !to_sender) {
+			} else {
 				if (!folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
 				    !folder_has_parent_of_type(msginfo->folder, F_OUTBOX) &&
 				    !folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {