From 47326377225c125b5fca37759faacfad1c75f20a Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Fri, 8 Jun 2001 00:12:52 +0000 Subject: Added an argument, so that the original source URI of the mbox can be 2001-06-07 Jon Trowbridge * camel-filter-driver.c (camel_filter_driver_filter_mbox): Added an argument, so that the original source URI of the mbox can be passed in. This is needed because this function is called post-movemail, so we are never reading from the original mbox anymore. Without the original mbox URI, the X-Evolution-Source tag gets set incorrectly and filter-on-source will fail to work. (camel_filter_driver_filter_message): Also take an extra arg for the original source URI. It is the original URI, not the source URI, that is used for filtering and for setting the X-Evolution-Source tag. 2001-06-07 Jon Trowbridge * mail-ops.c (fetch_mail_fetch): Pass the original source URI to camel_filter_driver_filter_mbox. (mail_send_message): Pass NULL as the orginal source URI to camel_filter_driver_filter_message. svn path=/trunk/; revision=10152 --- mail/ChangeLog | 7 +++++++ mail/mail-ops.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 5cf9910a36..e12cca3bfd 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2001-06-07 Jon Trowbridge + + * mail-ops.c (fetch_mail_fetch): Pass the original source URI + to camel_filter_driver_filter_mbox. + (mail_send_message): Pass NULL as the orginal source URI + to camel_filter_driver_filter_message. + 2001-06-06 Jon Trowbridge * mail-account-gui.c (source_type_changed): Check that the chain diff --git a/mail/mail-ops.c b/mail/mail-ops.c index ba12baa140..4812f8c110 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -296,7 +296,7 @@ fetch_mail_fetch(struct _mail_msg *mm) if (path && !camel_exception_is_set (&mm->ex)) { camel_folder_freeze(fm->destination); camel_filter_driver_set_default_folder(fm->driver, fm->destination); - camel_filter_driver_filter_mbox(fm->driver, path, &mm->ex); + camel_filter_driver_filter_mbox(fm->driver, path, m->source_uri, &mm->ex); camel_folder_thaw(fm->destination); if (!camel_exception_is_set (&mm->ex)) @@ -549,7 +549,7 @@ mail_send_message(CamelMimeMessage *message, const char *destination, CamelFilte if (driver) camel_filter_driver_filter_message (driver, message, info, - NULL, NULL, "", ex); + NULL, NULL, NULL, "", ex); if (sent_folder_uri) { folder = mail_tool_uri_to_folder (sent_folder_uri, NULL); -- cgit v1.2.3