talons

commit 8903559ecddd5a5dc12c02fbf0195ad006d8c4b9
parent 55202fbcffd8741b84489f8f4f8c25956469f1bc
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 22 Nov 2010 20:59:56 +0000

2010-11-22 [colin]	3.7.7cvs4

	* src/compose.c
		Revert 3.7.6cvs{39,38,37,35,34}. The fact that
		five patches were needed to fix a corner case
		is a good indicator that is was bound to break
		something.

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
6
++----

4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-22 [colin]	3.7.7cvs4
+
+	* src/compose.c
+		Revert 3.7.6cvs{39,38,37,35,34}. The fact that
+		five patches were needed to fix a corner case
+		is a good indicator that is was bound to break
+		something.
+
 2010-11-21 [colin]	3.7.7cvs3
 
 	* src/plugins/pgpcore/claws.def
diff --git a/PATCHSETS b/PATCHSETS
@@ -4065,3 +4065,4 @@
 ( cvs diff -u -r 1.100.2.75 -r 1.100.2.76 AUTHORS;  ) > 3.7.7cvs1.patchset
 ( cvs diff -u -r 1.115.2.231 -r 1.115.2.232 src/main.c;  ) > 3.7.7cvs2.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/claws.def;  ) > 3.7.7cvs3.patchset
+( cvs diff -u -r 1.382.2.560 -r 1.382.2.561 src/compose.c;  ) > 3.7.7cvs4.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -3214,9 +3214,7 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
 			 	 compose->followup_to ? compose->followup_to :
 			 	 compose->newsgroups ? compose->newsgroups : "",
 			 	 COMPOSE_NEWSGROUPS, PREF_NONE);
-		} else if (reply_to_ml)
-			compose_entry_append(compose,
-				   compose->ml_post, COMPOSE_TO, PREF_ML); 
+		} 
 		else 
 			compose_entry_append
 				(compose,
@@ -3227,7 +3225,7 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
 	compose_reply_set_subject(compose, msginfo);
 
 	if (to_ml && compose->ml_post) return;
-	if (!to_all) return;
+	if (!to_all || compose->account->protocol == A_NNTP) return;
 
 	if (compose->replyto) {
 		Xstrdup_a(replyto, compose->replyto, return);