aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-10-19 15:36:01 +0800
committerMilan Crha <mcrha@redhat.com>2010-10-19 15:36:01 +0800
commit98e867b9ce4a3af332ddd96c4a19ee942a89f401 (patch)
tree6dd2f5e418009af49d6bb8aad1c17f3f0d501032
parent729370ec6386fb990fee328060f36ca75a60a3ac (diff)
downloadgsoc2013-evolution-98e867b9ce4a3af332ddd96c4a19ee942a89f401.tar
gsoc2013-evolution-98e867b9ce4a3af332ddd96c4a19ee942a89f401.tar.gz
gsoc2013-evolution-98e867b9ce4a3af332ddd96c4a19ee942a89f401.tar.bz2
gsoc2013-evolution-98e867b9ce4a3af332ddd96c4a19ee942a89f401.tar.lz
gsoc2013-evolution-98e867b9ce4a3af332ddd96c4a19ee942a89f401.tar.xz
gsoc2013-evolution-98e867b9ce4a3af332ddd96c4a19ee942a89f401.tar.zst
gsoc2013-evolution-98e867b9ce4a3af332ddd96c4a19ee942a89f401.zip
Bug #567265 - BCC kept on message forward from Sent folder
-rw-r--r--em-format/em-format-quote.c4
-rw-r--r--mail/em-composer-utils.c6
-rw-r--r--mail/em-composer-utils.h4
3 files changed, 10 insertions, 4 deletions
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
index 569c46f9c4..6d6ed6a4ab 100644
--- a/em-format/em-format-quote.c
+++ b/em-format/em-format-quote.c
@@ -383,6 +383,10 @@ emfq_format_header (EMFormat *emf,
strcpy (name, namein);
canon_header_name (name);
+ /* Never quote Bcc headers */
+ if (g_str_equal (name, "Bcc") || g_str_equal (name, "Resent-Bcc"))
+ return;
+
for (i = 0; addrspec_hdrs[i]; i++) {
if (!strcmp (name, addrspec_hdrs[i])) {
addrspec = TRUE;
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index ff977bd66e..505d50e850 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1607,6 +1607,12 @@ redirect_get_composer (EShell *shell,
while (camel_medium_get_header (CAMEL_MEDIUM (message), "Delivered-To"))
camel_medium_remove_header (CAMEL_MEDIUM (message), "Delivered-To");
+ while (camel_medium_get_header (CAMEL_MEDIUM (message), "Bcc"))
+ camel_medium_remove_header (CAMEL_MEDIUM (message), "Bcc");
+
+ while (camel_medium_get_header (CAMEL_MEDIUM (message), "Resent-Bcc"))
+ camel_medium_remove_header (CAMEL_MEDIUM (message), "Resent-Bcc");
+
account = em_utils_guess_account_with_recipients (message, NULL);
composer = e_msg_composer_new_redirect (
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index 81e8cf1eb0..e1974aa8f3 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -67,10 +67,6 @@ void em_utils_redirect_message (EShell *shell,
void em_utils_redirect_message_by_uid (EShell *shell,
CamelFolder *folder,
const gchar *uid);
-void em_utils_forward_message_raw (CamelFolder *folder,
- CamelMimeMessage *message,
- const gchar *address,
- GError **error);
void em_utils_handle_receipt (EMailSession *session,
CamelFolder *folder,
const gchar *uid,