talons

commit ae41ff3b3b70703c73e0917dad97f4328dc23778
parent 8f783ae31028f19010c5bcc9ba0a07f287c28709
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 19 Sep 2010 14:17:18 +0000

2010-09-19 [colin]	3.7.6cvs39

	* src/compose.c
		Fix cvs34 and cvs35. NNTP accounts are mandatory to post
		to newsgroups, and NNTP accounts *can* send email. We
		should not force an email account when replying to_ml or
		anything...

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

4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-19 [colin]	3.7.6cvs39
+
+	* src/compose.c
+		Fix cvs34 and cvs35. NNTP accounts are mandatory to post
+		to newsgroups, and NNTP accounts *can* send email. We 
+		should not force an email account when replying to_ml or
+		anything...
+
 2010-09-19 [colin]	3.7.6cvs38
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4034,3 +4034,4 @@
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 doc/man/claws-mail.1;  ) > 3.7.6cvs36.patchset
 ( cvs diff -u -r 1.382.2.555 -r 1.382.2.556 src/compose.c;  ) > 3.7.6cvs37.patchset
 ( cvs diff -u -r 1.382.2.556 -r 1.382.2.557 src/compose.c;  ) > 3.7.6cvs38.patchset
+( cvs diff -u -r 1.382.2.557 -r 1.382.2.558 src/compose.c;  ) > 3.7.6cvs39.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -3214,11 +3214,10 @@ 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_check_for_email_account(compose);
+		} else if (reply_to_ml)
 			compose_entry_append(compose,
 				   compose->ml_post, COMPOSE_TO, PREF_ML); 
-		} else 
+		else 
 			compose_entry_append
 				(compose,
 			 	 compose->followup_to ? compose->followup_to :