diff options
-rw-r--r-- | filter/ChangeLog | 6 | ||||
-rw-r--r-- | filter/filter-driver.c | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 55354750e9..d8a1f75ed3 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,5 +1,11 @@ 2000-09-09 Jeffrey Stedfast <fejj@helixcode.com> + * filter-driver.c (filter_driver_run): Fixed a logic error. Only + mark filtered as TRUE if it was successfully copied to another + folder, this means don't mark true if the default inbox is NULL. + +2000-09-09 Jeffrey Stedfast <fejj@helixcode.com> + * filter-driver.c (filter_driver_run): Erm, okay I misunderstood what camel_folder_[un]hook_event() did - we don't even need this crap in the filter driver so lets take it completely out and let diff --git a/filter/filter-driver.c b/filter/filter-driver.c index 75c3b2ac5c..e82c884f6e 100644 --- a/filter/filter-driver.c +++ b/filter/filter-driver.c @@ -466,11 +466,13 @@ filter_driver_run (FilterDriver *driver, CamelMimeMessage *message, CamelMessage g_string_free (fsearch, TRUE); g_string_free (faction, TRUE); - if (!p->deleted && g_hash_table_size (p->folders) == 0 && inbox) { - /* copy it to the default inbox */ - mail_tool_camel_lock_up (); - camel_folder_append_message (inbox, p->message, p->info, p->ex); - mail_tool_camel_lock_down (); + if (!p->deleted && g_hash_table_size (p->folders) == 0) { + if (inbox) { + /* copy it to the default inbox */ + mail_tool_camel_lock_up (); + camel_folder_append_message (inbox, p->message, p->info, p->ex); + mail_tool_camel_lock_down (); + } } else { filtered = TRUE; } |