From a05fb2235885bb5d2f37c6fffaeac223ea869b71 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 4 Oct 2005 20:29:44 +0000 Subject: [PATCH] 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. --- ChangeLog-gtk2.claws | 10 ++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 46 ++++++++++++++++++++++++++++++++------------ 4 files changed, 46 insertions(+), 13 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index b3a73fa91..680f1e66e 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -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 diff --git a/PATCHSETS b/PATCHSETS index 417e24adc..f593862bc 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -848,3 +848,4 @@ ( 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 diff --git a/configure.ac b/configure.ac index bec2913d4..1dc78c01f 100644 --- a/configure.ac +++ b/configure.ac @@ -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= diff --git a/src/compose.c b/src/compose.c index 078ac50e7..7a5000c8b 100644 --- a/src/compose.c +++ b/src/compose.c @@ -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) { -- 2.25.1