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...

diff --git a/ChangeLog b/ChangeLog
index 33b1e6679a074f394565db8c6d384c16d8f41e59..e2d397ee4108f21424f6a5e79341be4d8fbd83e5 100644 (file)
--- 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
 2010-09-19 [colin]     3.7.6cvs38
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 1af09f7934af3392695f49436bbd95ace090ea00..fdc6f03689920afa25c597fb64f276a142283382 100644 (file)
--- 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.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
index b6462ff411fcaa58b182e973705da3c0c74b3343..326cfaca74f6df9cf11d7f21ec832802a03ff6bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=38
+EXTRA_VERSION=39

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index f86d7ff3dc31f930714d607dc73e9fec3d75a476..d88315a1ac6fb37c2be4844cab28ea883ff0b02b 100644 (file)
--- 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);
                                 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); 
                        compose_entry_append(compose,
                                   compose->ml_post, COMPOSE_TO, PREF_ML); 

-               } else 
+               else 

                        compose_entry_append
                                (compose,
                                 compose->followup_to ? compose->followup_to :
                        compose_entry_append
                                (compose,
                                 compose->followup_to ? compose->followup_to :