Added an argument, so that the original source URI of the mbox can be

2001-06-07  Jon Trowbridge  <trow@ximian.com>

        * 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  <trow@ximian.com>

        * 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

5 files changed, 36 insertions, 11 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index cf6b62ffda..11f3b4c433 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,16 @@
+2001-06-07  Jon Trowbridge  <trow@ximian.com>
+
+	* 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-05  Dan Winship  <danw@ximian.com>
 
 	* providers/imap/camel-imap-folder.c (imap_rescan): Don't fetch
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index 464ccc1539..d70798f6f2 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -628,7 +628,7 @@ camel_filter_driver_log (CamelFilterDriver *driver, enum filter_log_t status, co
  *
  **/
 int
-camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, CamelException *ex)
+camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, const char *original_source_url, CamelException *ex)
 {
 	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
 	CamelMimeParser *mp = NULL;
@@ -673,7 +673,8 @@ camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, Ca
 			goto fail;
 		}
 		
-		status = camel_filter_driver_filter_message (driver, msg, NULL, NULL, NULL, source_url, ex);
+		status = camel_filter_driver_filter_message (driver, msg, NULL, NULL, NULL, source_url, 
+							     original_source_url ? original_source_url : source_url, ex);
 		camel_object_unref (CAMEL_OBJECT (msg));
 		if (camel_exception_is_set (ex) || status == -1) {
 			report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed message %d"), i);
@@ -762,7 +763,7 @@ camel_filter_driver_filter_folder (CamelFilterDriver *driver, CamelFolder *folde
 			info = NULL;
 		
 		status = camel_filter_driver_filter_message (driver, message, info, uids->pdata[i],
-							     folder, source_url, ex);
+							     folder, source_url, source_url, ex);
 		
 		if (camel_folder_has_summary_capability (folder))
 			camel_folder_free_message_info (folder, info);
@@ -806,6 +807,7 @@ camel_filter_driver_filter_folder (CamelFilterDriver *driver, CamelFolder *folde
  * @uid: message uid or NULL
  * @source: source folder or NULL
  * @source_url: url of source folder or NULL
+ * @original_source_url: url of original source folder (pre-movemail) or NULL
  * @ex: exception
  *
  * Filters a message based on rules defined in the FilterDriver
@@ -822,6 +824,7 @@ int
 camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage *message,
 				    CamelMessageInfo *info, const char *uid,
 				    CamelFolder *source, const char *source_url,
+				    const char *original_source_url,
 				    CamelException *ex)
 {
 	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);
@@ -848,15 +851,17 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage
 	p->info = info;
 	p->uid = uid;
 	p->source = source;
-	
-	if (camel_mime_message_get_source (message) == NULL)
-		camel_mime_message_set_source (message, source_url);
+
+	if (original_source_url && camel_mime_message_get_source (message) == NULL)
+		camel_mime_message_set_source (message, original_source_url);
 	
 	node = (struct _filter_rule *)p->rules.head;
 	while (node->next) {
 		d(fprintf (stderr, "applying rule %s\n action %s\n", node->match, node->action));
 		
-		if (camel_filter_search_match(p->message, p->info, source_url, node->match, p->ex)) {
+		if (camel_filter_search_match(p->message, p->info, 
+					      original_source_url ? original_source_url : source_url,
+					      node->match, p->ex)) {
 			filtered = TRUE;
 			camel_filter_driver_log (driver, FILTER_LOG_START, node->name);
 			
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
index 94cc54820b..69e9518e7e 100644
--- a/camel/camel-filter-driver.h
+++ b/camel/camel-filter-driver.h
@@ -75,9 +75,9 @@ void 	camel_filter_driver_add_rule		(CamelFilterDriver *d, const char *name, con
 
 int      camel_filter_driver_filter_message      (CamelFilterDriver *driver, CamelMimeMessage *message,
 						  CamelMessageInfo *info, const char *uri,
-						  CamelFolder *source, const char *source_url,
+						  CamelFolder *source, const char *source_url, const char *original_source_url,
 						  CamelException *ex);
-int      camel_filter_driver_filter_mbox         (CamelFilterDriver *driver, const char *mbox,
+int      camel_filter_driver_filter_mbox         (CamelFilterDriver *driver, const char *mbox, const char *original_source_url,
 						  CamelException *ex);
 int      camel_filter_driver_filter_folder       (CamelFilterDriver *driver, CamelFolder *folder,
 						  GPtrArray *uids, gboolean remove, CamelException *ex);
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  <trow@ximian.com>
+
+	* 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  <trow@ximian.com>
 
 	* 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);