From ba1a5e5771603e2adf817ad8285081cde3376f06 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 22 Oct 2005 09:04:05 +0000 Subject: [PATCH] 2005-10-22 [colin] 1.9.15cvs90 * src/compose.c When replying to a mail sent by one of our accounts, use the original list of recipients. Let 'Reply All' and 'Reply to sender' work like previously. --- ChangeLog-gtk2.claws | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 25 ++++++++++++++++++++----- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index c71bfdf61..2e6e6ebc6 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,10 @@ +2005-10-22 [colin] 1.9.15cvs90 + + * src/compose.c + When replying to a mail sent by one of our accounts, + use the original list of recipients. Let 'Reply All' + and 'Reply to sender' work like previously. + 2005-10-21 [colin] 1.9.15cvs89 * src/prefs_filtering.c diff --git a/PATCHSETS b/PATCHSETS index 5dce8d7ea..95c44038c 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -926,3 +926,4 @@ ( cvs diff -u -r 1.25.2.6 -r 1.25.2.7 tools/Makefile.am; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/OOo2sylpheed.pl; cvs diff -u -r 1.30.2.5 -r 1.30.2.6 tools/README; cvs diff -u -r 1.1 -r 1.2 tools/README.sylprint; cvs diff -u -r -1.1.2.2 -r -1.1.2.3 tools/asus_mailled.sh; cvs diff -u -r 1.16.2.2 -r 1.16.2.3 tools/filter_conv.pl; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/freshmeat_search.pl; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/google_search.pl; cvs diff -u -r -1.1 -r -1.2 tools/gpg-sign-syl; cvs diff -u -r 1.1.14.1 -r 1.1.14.2 tools/kmail2sylpheed.pl; cvs diff -u -r 1.3.4.1 -r 1.3.4.2 tools/kmail2sylpheed_v2.pl; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/multiwebsearch.pl; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 tools/nautilus2sylpheed.sh; cvs diff -u -r 1.2.14.1 -r 1.2.14.2 tools/newscache_clean.pl; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 tools/outlook2sylpheed.pl; cvs diff -u -r -1.1.14.1 -r -1.1.14.2 tools/sylpheed-switcher; cvs diff -u -r 1.2 -r 1.3 tools/sylprint.pl; cvs diff -u -r 1.1 -r 1.2 tools/sylprint.rc; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 tools/tb2sylpheed; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 tools/vcard2xml.py; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 tools/kdeservicemenu/sylpheed-kdeservicemenu.pl; ) > 1.9.15cvs87.patchset ( cvs diff -u -r 1.382.2.185 -r 1.382.2.186 src/compose.c; cvs diff -u -r 1.207.2.77 -r 1.207.2.78 src/folderview.c; cvs diff -u -r 1.52.2.15 -r 1.52.2.16 src/prefs_folder_item.c; cvs diff -u -r 1.43.2.31 -r 1.43.2.32 src/toolbar.c; ) > 1.9.15cvs88.patchset ( cvs diff -u -r 1.59.2.25 -r 1.59.2.26 src/prefs_filtering.c; cvs diff -u -r 1.96.2.81 -r 1.96.2.82 src/textview.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpinline/pgpinline.c; ) > 1.9.15cvs89.patchset +( cvs diff -u -r 1.382.2.186 -r 1.382.2.187 src/compose.c; ) > 1.9.15cvs90.patchset diff --git a/configure.ac b/configure.ac index c4aa8bc3e..623729a83 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=89 +EXTRA_VERSION=90 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index 878f8a6f6..642db7f2b 100644 --- a/src/compose.c +++ b/src/compose.c @@ -2231,12 +2231,27 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo, compose_entry_append(compose, msginfo->folder->prefs->default_reply_to, COMPOSE_TO); - } else - compose_entry_append(compose, + } else { + gchar *tmp1 = NULL; + Xstrdup_a(tmp1, msginfo->from, return); + extract_address(tmp1); + if (to_all || to_sender || + !account_find_from_address(tmp1)) + compose_entry_append(compose, (compose->replyto && !to_sender) - ? compose->replyto : - msginfo->from ? msginfo->from : "", - COMPOSE_TO); + ? compose->replyto : + msginfo->from ? msginfo->from : "", + COMPOSE_TO); + else if (!to_all && !to_sender) { + /* reply to the last list of recipients */ + compose_entry_append(compose, + msginfo->to ? msginfo->to : "", + COMPOSE_TO); + compose_entry_append(compose, + msginfo->cc ? msginfo->cc : "", + COMPOSE_CC); + } + } } else { if (to_sender || (compose->followup_to && !strncmp(compose->followup_to, "poster", 6))) -- 2.25.1