diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2013-02-14 08:01:28 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2013-02-14 08:01:28 +0000 |
| commit | dac50a4059b01b89aa46565370a1a9a14d957455 (patch) | |
| tree | d635e4bfa30d49dba8428fbf1e596385c2a8929d /libsylph/filter.c | |
| parent | ae3597033e34c838ff5d18f69f3fb64f00c798c4 (diff) | |
added an option: 'Do not classify message as junk if sender is in the address book'
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3222 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'libsylph/filter.c')
| -rw-r--r-- | libsylph/filter.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libsylph/filter.c b/libsylph/filter.c index bb6a1c74..813ed329 100644 --- a/libsylph/filter.c +++ b/libsylph/filter.c @@ -1586,9 +1586,16 @@ FilterRule *filter_junk_rule_create(PrefsAccount *account, debug_print("filter_junk_rule_create: junk folder: %s\n", junk_id); + if (prefs_common.nofilter_junk_sender_in_book) { + cond = filter_cond_new(FLT_COND_HEADER, FLT_IN_ADDRESSBOOK, + FLT_NOT_MATCH, "From", NULL); + cond_list = g_slist_append(cond_list, cond); + } + cond = filter_cond_new(FLT_COND_CMD_TEST, 0, 0, NULL, prefs_common.junk_classify_cmd); - cond_list = g_slist_append(NULL, cond); + cond_list = g_slist_append(cond_list, cond); + if (prefs_common.delete_junk_on_recv && !is_manual) { action = filter_action_new(FLT_ACTION_COPY, junk_id); action_list = g_slist_append(NULL, action); @@ -1605,10 +1612,10 @@ FilterRule *filter_junk_rule_create(PrefsAccount *account, } if (is_manual) - rule = filter_rule_new(_("Junk mail filter (manual)"), FLT_OR, + rule = filter_rule_new(_("Junk mail filter (manual)"), FLT_AND, cond_list, action_list); else - rule = filter_rule_new(_("Junk mail filter"), FLT_OR, + rule = filter_rule_new(_("Junk mail filter"), FLT_AND, cond_list, action_list); g_free(junk_id); |