From: Thorsten Maerz <torte@netztorte.de>
Date: Tue, 26 Nov 2002 21:00:58 +0000 (+0000)
Subject: fix default-reply-to (closes Feture Request #643656)
X-Git-Tag: claws31~2
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=0f3d603b3595a9123cf3d6e2838cc0266bb1796f

fix default-reply-to (closes Feture Request #643656)
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index fb5b01a77..ebe5d2e41 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-11-26 [thorsten]	0.8.6claws15
+
+	* src/compose.c
+		default-reply-to didn't work for ml-reply
+
 2002-11-26 [melvin]	0.8.6claws14
 
 	* src/prefs_actions.c
diff --git a/configure.in b/configure.in
index cbe99c439..2eb03087a 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws14
+EXTRA_VERSION=claws15
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index 61d88ef7c..7c08e2a01 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1660,7 +1660,8 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
 	g_return_if_fail(msginfo != NULL);
 
 	if (compose->account->protocol != A_NNTP || followup_and_reply_to) {
-		if (!compose->replyto && to_ml && compose->ml_post)
+		if (!compose->replyto && to_ml && compose->ml_post
+		    && !(msginfo->folder && msginfo->folder->prefs->enable_default_reply_to))
 			compose_entry_append(compose,
 					   compose->ml_post,
 					   COMPOSE_TO);