2007-12-22 [paul] 3.2.0cvs15
authorPaul Mangan <paul@claws-mail.org>
Sat, 22 Dec 2007 09:43:22 +0000 (09:43 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sat, 22 Dec 2007 09:43:22 +0000 (09:43 +0000)
* src/compose.c
fix bug 1435, 'Reply doesn't take into account
reply-to field'

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index 5044dd6eb7249cb83e7f70d30b074c2bec99437f..a7e9d90108c77df320ef3f7ac2b34ceeb6c0112e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-22 [paul]      3.2.0cvs15
+
+       * src/compose.c
+               fix bug 1435, 'Reply doesn't take into account
+               reply-to field'
+
 2007-12-21 [paul]      3.2.0cvs14
 
        * src/common/ssl_certificate.c
index 5718c9bfc41703c03fd39ac29d7fec5b1e4d7126..ae6d0eed22d05597b45f1003fc39479f66a2a9c1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.179.2.204 -r 1.179.2.205 src/imap.c;  cvs diff -u -r 1.34.2.19 -r 1.34.2.20 src/imap.h;  cvs diff -u -r 1.105.2.121 -r 1.105.2.122 src/prefs_account.c;  ) > 3.2.0cvs12.patchset
 ( cvs diff -u -r 1.179.2.205 -r 1.179.2.206 src/imap.c;  ) > 3.2.0cvs13.patchset
 ( cvs diff -u -r 1.4.2.24 -r 1.4.2.25 src/common/ssl_certificate.c;  ) > 3.2.0cvs14.patchset
+( cvs diff -u -r 1.382.2.427 -r 1.382.2.428 src/compose.c;  ) > 3.2.0cvs15.patchset
index 86bd8f900874cfabf92fd5f1a3e4c67c49d20962..bbe30efa99d9ddf981725b2353ecedea8d7a754c 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 29993a04cbaeca3a8b80b565c370743707f5b83e..a54fcd001cf429243abcd0d5f7123d1073c672d8 100644 (file)
@@ -2901,9 +2901,15 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                                if (!folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
                                    !folder_has_parent_of_type(msginfo->folder, F_OUTBOX) &&
                                    !folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
-                                       compose_entry_append(compose,
-                                                 msginfo->from ? msginfo->from : "",
-                                                 COMPOSE_TO);
+                                       if (compose->replyto) {
+                                               compose_entry_append(compose,
+                                                       compose->replyto,
+                                                       COMPOSE_TO);
+                                       } else {
+                                               compose_entry_append(compose,
+                                                         msginfo->from ? msginfo->from : "",
+                                                         COMPOSE_TO);
+                                       }
                                } else {
                                        /* replying to own mail, use original recp */
                                        compose_entry_append(compose,