diff options
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/camel-filter-driver.c | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index a4366f08b9..8590b77982 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,10 @@ +2001-01-19 Jeffrey Stedfast <fejj@ximian.com> + + * camel-filter-driver.c (camel_filter_driver_filter_message): Set + the deleted bit *before* copying to the default folder, this way + if they are importing mail and have a rule to delete it, it + doesn't get copied to the default folder un-deleted. + 2001-01-19 Dan Winship <danw@ximian.com> * providers/imap/camel-imap-store.c diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c index 2de96a14ea..fc783c4c08 100644 --- a/camel/camel-filter-driver.c +++ b/camel/camel-filter-driver.c @@ -761,6 +761,10 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage node = node->next; } + /* *Now* we can set the DELETED flag... */ + if (p->deleted) + info->flags = info->flags | CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_FOLDER_FLAGGED; + /* Logic: if !Moved and there exists a default folder... */ if (!(p->copied && p->deleted) && p->defaultfolder) { /* copy it to the default inbox */ @@ -769,10 +773,6 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage camel_folder_append_message (p->defaultfolder, p->message, p->info, p->ex); } - /* *Now* we can set the DELETED flag... */ - if (p->deleted) - info->flags = info->flags | CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_FOLDER_FLAGGED; - if (freeinfo) camel_message_info_free (info); |