2010-11-22 [colin] 3.7.7cvs4
authorColin Leroy <colin@colino.net>
Mon, 22 Nov 2010 20:59:56 +0000 (20:59 +0000)
committerColin Leroy <colin@colino.net>
Mon, 22 Nov 2010 20:59:56 +0000 (20:59 +0000)
* 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.

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index e96c19331e9f5e59ded6088a1911d2087169f9a2..07c96a018c42d60d13a54a75dd57bfe55951dbd0 100644 (file)
--- 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
index f19fa9442e070ef118c21cbe464ec2642ecf676b..9a2ecc5454b6a8428bd0941734ea5147492127d0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index a493c08bbadb6565bfae6d6427b8a09f9140365a..7041d5804513f774ee2e4b881822b508c8f9dc33 100644 (file)
@@ -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=
 
index d88315a1ac6fb37c2be4844cab28ea883ff0b02b..0870ee9c5aa7f94fc98e2945ba65b7448005b075 100644 (file)
@@ -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);