From 6ffa930086b903dbd8fed3543f5e4ed762b6e8d1 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Thu, 28 Jun 2001 20:35:43 +0000 Subject: Add a CamelMimeFilterStripHeader that removes a header from mime output. Used by sendmail to strip the BCC from the email while still sending to the BCC recipients. camel: 2001-06-28 Peter Williams * camel-mime-filter-stripheader.c: New file. Filter that strips a header from mime output. * camel-mime-filter-stripheader.h: New file. Header for the above. * providers/smtp/camel-smtp-transport.c (smtp_data): Use the stripheader filter to remove the "Bcc" header. * Makefile.am: Add the stripheader files. * tests/lib/Makefile.am (INCLUDES): Get this to compile again. * tests/mime-filter/test-stripheader.c: New file. Test suite for the CamelMimeFilterStripHeader. * tests/mime-filter/Makefile.am: New test section: mime filters. mail: 2001-06-28 Peter Williams * mail-ops.c (mail_send_message): Revert fejj's Bcc header removal; this unsets the BCC recipients and so doesn't send to the Bcc'd people at all. svn path=/trunk/; revision=10576 --- mail/ChangeLog | 6 ++++++ mail/mail-ops.c | 13 ++----------- 2 files changed, 8 insertions(+), 11 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 3e8d0a0708..49c98fa77e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2001-06-28 Peter Williams + + * mail-ops.c (mail_send_message): Revert fejj's Bcc header removal; + this unsets the BCC recipients and so doesn't send to the Bcc'd + people at all. + 2001-06-28 Jeffrey Stedfast * mail-send-recv.c (free_send_data): The e_iterator_get() returns diff --git a/mail/mail-ops.c b/mail/mail-ops.c index dde285e827..f433d99c5a 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -494,7 +494,7 @@ mail_send_message(CamelMimeMessage *message, const char *destination, CamelFilte CamelTransport *xport = NULL; CamelFolder *folder; const char *version, *header; - gchar *acct_header, *bcc_header; + gchar *acct_header; char *transport_url = NULL, *sent_folder_uri = NULL; if (SUB_VERSION[0] == '\0') @@ -538,10 +538,7 @@ mail_send_message(CamelMimeMessage *message, const char *destination, CamelFilte camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc"); } } - - bcc_header = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "Bcc")); - camel_medium_remove_header (CAMEL_MEDIUM (message), "Bcc"); - + xport = camel_session_get_transport (session, transport_url ? transport_url : destination, ex); g_free (transport_url); if (!xport) { @@ -566,12 +563,6 @@ mail_send_message(CamelMimeMessage *message, const char *destination, CamelFilte g_free (acct_header); } - /* Re-attach the Bcc header */ - if (bcc_header) { - camel_medium_add_header (CAMEL_MEDIUM (message), "Bcc", bcc_header); - g_free (bcc_header); - } - if (driver) camel_filter_driver_filter_message (driver, message, info, NULL, NULL, NULL, "", ex); -- cgit v1.2.3