diff options
| -rw-r--r-- | filter/ChangeLog | 8 | ||||
| -rw-r--r-- | filter/filter-driver.c | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 5315178316..1ec80d08c4 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,11 @@ +2000-08-11 Dan Winship <danw@helixcode.com> + + * filter-driver.c (do_filter_mail): Remove an '#if 0' that must + have been left in accidentally, so that messages which are copied + to other folders will not also be copied into the Inbox. Also, + #ifdef out the line that printfs the rule, because the rules are + often very large. + 2000-08-11 Not Zed <NotZed@HelixCode.com> * filter-driver.c (do_colour): Use proper accessor function diff --git a/filter/filter-driver.c b/filter/filter-driver.c index 78145f5086..b86cdf0f04 100644 --- a/filter/filter-driver.c +++ b/filter/filter-driver.c @@ -508,7 +508,9 @@ do_filter_mail (gpointer in_data, gpointer op_data, CamelException *ex) filter_rule_build_code((FilterRule *)rule, s); filter_filter_build_action(rule, a); +#if 0 printf("applying rule %s\n action %s\n", s->str, a->str); +#endif mail_tool_camel_lock_up (); p->matches = camel_folder_search_by_expression (p->source, s->str, p->ex); @@ -518,12 +520,11 @@ do_filter_mail (gpointer in_data, gpointer op_data, CamelException *ex) for (i = 0; i < p->matches->len; i++) { uid = p->matches->pdata[i]; -#if 0 /* for all matching id's, so we can work out what to default */ if (g_hash_table_lookup (p->processed, uid) == NULL) { g_hash_table_insert (p->processed, uid, GINT_TO_POINTER (1)); } -#endif + if (g_hash_table_lookup (p->terminated, uid)) { g_ptr_array_remove_index_fast (p->matches, i); i--; |