diff options
| -rw-r--r-- | filter/ChangeLog | 5 | ||||
| -rw-r--r-- | filter/filter-driver.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 656a9043ff..fcec697a57 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,8 @@ +2001-01-19 Jeffrey Stedfast <fejj@ximian.com> + + * filter-driver.c (filter_driver_filter_message): Set the delete + bit *before* copying to the default folder. + 2001-01-18 Jeffrey Stedfast <fejj@ximian.com> * filter-filter.c (less_parts): Er, don't set the button diff --git a/filter/filter-driver.c b/filter/filter-driver.c index 2c5c25c780..922d1cb2e1 100644 --- a/filter/filter-driver.c +++ b/filter/filter-driver.c @@ -754,6 +754,10 @@ filter_driver_filter_message (FilterDriver *driver, CamelMimeMessage *message, C g_string_free (fsearch, TRUE); g_string_free (faction, TRUE); + /* *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 */ @@ -762,10 +766,6 @@ filter_driver_filter_message (FilterDriver *driver, CamelMimeMessage *message, C 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); |