diff options
| -rw-r--r-- | camel/ChangeLog | 9 | ||||
| -rw-r--r-- | camel/camel-filter-driver.c | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index eff0e3f1b0..fc6edd237a 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,12 @@ +2001-03-25 Jeffrey Stedfast <fejj@ximian.com> + + * camel-filter-driver.c (do_copy): Don't use copy_to if the source + folder doesn't support summary info's. + (do_move): Same. + (camel_filter_driver_filter_message): And again here. I think + this will fix the problem of "colour" tags not staying with the + message when it's copied to a folder during the filter process. + 2001-03-24 Jeffrey Stedfast <fejj@ximian.com> * camel-sasl-digest-md5.c (digest_response): Do charset conversion diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c index 17e7d92629..261f727610 100644 --- a/camel/camel-filter-driver.c +++ b/camel/camel-filter-driver.c @@ -371,7 +371,7 @@ do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriv break; p->copied = TRUE; - if (p->uid && p->source) + if (p->uid && p->source && camel_folder_has_summary_capability (p->source)) camel_folder_copy_message_to (p->source, p->uid, outbox, p->ex); else camel_folder_append_message (outbox, p->message, p->info, p->ex); @@ -408,7 +408,7 @@ do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriv p->copied = TRUE; p->deleted = TRUE; /* a 'move' is a copy & delete */ - if (p->uid && p->source) + if (p->uid && p->source && camel_folder_has_summary_capability (p->source)) camel_folder_copy_message_to (p->source, p->uid, outbox, p->ex); else camel_folder_append_message (outbox, p->message, p->info, p->ex); @@ -833,7 +833,7 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage p->info = info; p->uid = uid; p->source = source; - + /* camel_mime_message_set_identity (message, source_url); */ node = (struct _filter_rule *)p->rules.head; @@ -871,7 +871,7 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage /* copy it to the default inbox */ filtered = TRUE; camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to default folder"); - if (p->uid && p->source) + if (p->uid && p->source && camel_folder_has_summary_capability (p->source)) camel_folder_copy_message_to (p->source, p->uid, p->defaultfolder, p->ex); else camel_folder_append_message (p->defaultfolder, p->message, p->info, p->ex); |