2005-10-04 [colin] 1.9.15cvs12
authorColin Leroy <colin@colino.net>
Tue, 4 Oct 2005 20:29:44 +0000 (20:29 +0000)
committerColin Leroy <colin@colino.net>
Tue, 4 Oct 2005 20:29:44 +0000 (20:29 +0000)
* src/compose.c
When replying to an ML post with Reply-To set
to the poster's email, honor it (as before),
but also honor our user's request to reply to
the mailing list: set the ML address in the To
field and the Reply-To address in the Cc:
field.

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/compose.c

index b3a73fa916e4dcde4209d31d2bc1a5d2af5e0b7a..680f1e66e7cf469a20521bbc0a9c316b0659e1d3 100644 (file)
@@ -1,3 +1,13 @@
+2005-10-04 [colin]     1.9.15cvs12
+
+       * src/compose.c
+               When replying to an ML post with Reply-To set
+               to the poster's email, honor it (as before),
+               but also honor our user's request to reply to
+               the mailing list: set the ML address in the To
+               field and the Reply-To address in the Cc: 
+               field.
+
 2005-10-04 [colin]     1.9.15cvs11
 
        * src/plugins/trayicon/trayicon.c
index 417e24adc62538a77abe2b556ff1333c0f8e4f65..f593862bc0d894505f446ee3d01268a1978682a8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.213.2.60 -r 1.213.2.61 src/folder.c;  cvs diff -u -r 1.87.2.19 -r 1.87.2.20 src/folder.h;  cvs diff -u -r 1.207.2.66 -r 1.207.2.67 src/folderview.c;  cvs diff -u -r 1.179.2.74 -r 1.179.2.75 src/imap.c;  cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/etpan/imap-thread.h;  ) > 1.9.15cvs9.patchset
 ( cvs diff -u -r 1.43.2.26 -r 1.43.2.27 src/toolbar.c;  ) > 1.9.15cvs10.patchset
 ( cvs diff -u -r 1.14.2.23 -r 1.14.2.24 src/plugins/trayicon/trayicon.c;  ) > 1.9.15cvs11.patchset
+( cvs diff -u -r 1.382.2.178 -r 1.382.2.179 src/compose.c;  ) > 1.9.15cvs12.patchset
index bec2913d44c298bb91e0b7a221e00daf77eb01d4..1dc78c01f355931308d1a880f97e8966852ac8f8 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 078ac50e798abdf78468f1dad0ae5f9b8e15b3c7..7a5000c8b1efb11bf2ef48a8e1ecb4d8434cbd81 100644 (file)
@@ -990,10 +990,12 @@ void compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
                              FALSE, prefs_common.default_reply_list, FALSE, body);
                break;
        case COMPOSE_REPLY_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, prefs_common.default_reply_list, FALSE, body);
+               compose_reply(msginfo, TRUE, 
+                       FALSE, prefs_common.default_reply_list, FALSE, body);
                break;
        case COMPOSE_REPLY_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, prefs_common.default_reply_list, FALSE, NULL);
+               compose_reply(msginfo, FALSE, 
+                       FALSE, prefs_common.default_reply_list, FALSE, NULL);
                break;
        case COMPOSE_REPLY_TO_SENDER:
                compose_reply(msginfo, prefs_common.reply_with_quote,
@@ -1005,30 +1007,36 @@ void compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
                                              FALSE, FALSE, body);
                break;
        case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, FALSE, TRUE, body);
+               compose_reply(msginfo, TRUE, 
+                       FALSE, FALSE, TRUE, body);
                break;
        case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, FALSE, TRUE, NULL);
+               compose_reply(msginfo, FALSE, 
+                       FALSE, FALSE, TRUE, NULL);
                break;
        case COMPOSE_REPLY_TO_ALL:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, FALSE, FALSE, body);
+                       TRUE, FALSE, FALSE, body);
                break;
        case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, TRUE, FALSE, FALSE, body);
+               compose_reply(msginfo, TRUE, 
+                       TRUE, FALSE, FALSE, body);
                break;
        case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, TRUE, FALSE, FALSE, NULL);
+               compose_reply(msginfo, FALSE, 
+                       TRUE, FALSE, FALSE, NULL);
                break;
        case COMPOSE_REPLY_TO_LIST:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE, FALSE, body);
+                       FALSE, TRUE, FALSE, body);
                break;
        case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, body);
+               compose_reply(msginfo, TRUE, 
+                       FALSE, TRUE, FALSE, body);
                break;
        case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
+               compose_reply(msginfo, FALSE, 
+                       FALSE, TRUE, FALSE, NULL);
                break;
        case COMPOSE_FORWARD:
                if (prefs_common.forward_as_attachment) {
@@ -2165,11 +2173,25 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
        g_return_if_fail(msginfo != NULL);
 
        if (compose->account->protocol != A_NNTP) {
-               if (!compose->replyto && to_ml && compose->ml_post
-                   && !(msginfo->folder && msginfo->folder->prefs->enable_default_reply_to))
+               if (to_ml && compose->ml_post
+                   && !(msginfo->folder && 
+                        msginfo->folder->prefs->enable_default_reply_to)) {
                        compose_entry_append(compose,
                                           compose->ml_post,
                                           COMPOSE_TO);
+                       if (compose->replyto) {
+                               gchar *tmp1 = NULL, *tmp2 = NULL;
+                               Xstrdup_a(tmp1, compose->replyto, return);
+                               if (compose->ml_post)
+                                       Xstrdup_a(tmp2, compose->ml_post, return);
+                               extract_address(tmp1);
+                               extract_address(tmp2);
+                               if (tmp1 && tmp2 && strcmp(tmp1, tmp2))
+                                       compose_entry_append(compose,
+                                                       compose->replyto,
+                                                       COMPOSE_CC);
+                       }
+               }
                else if (!(to_all || to_sender)
                         && msginfo->folder
                         && msginfo->folder->prefs->enable_default_reply_to) {