aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-session.c
diff options
context:
space:
mode:
authorRadek Doulik <rodo@src.gnome.org>2003-11-13 05:13:05 +0800
committerRadek Doulik <rodo@src.gnome.org>2003-11-13 05:13:05 +0800
commit8e1251fa17b522d0539a8fcfb7463ba8cef1b31a (patch)
tree9be2f3a8a184446361a8c72879947f7a6e7d8d75 /mail/mail-session.c
parent8187001a14295b4b64cc3e973fb1ab1e551133f2 (diff)
downloadgsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.tar.gz
gsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.tar.zst
gsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.zip
merged spam filtering branch
svn path=/trunk/; revision=23302
Diffstat (limited to 'mail/mail-session.c')
-rw-r--r--mail/mail-session.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 58773513c4..0db6f38ba8 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -48,6 +48,7 @@
#include "mail-ops.h"
#include "e-util/e-passwords.h"
#include "e-util/e-msgport.h"
+#include "em-junk-filter.h"
#define d(x)
@@ -626,6 +627,9 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException
fsearch = g_string_new ("");
faction = g_string_new ("");
+
+ /* implicit junk check as 1st rule */
+ camel_filter_driver_add_rule (driver, "Junk check", "(junk-test)", "(begin (set-system-flag \"junk\"))");
/* add the user-defined rules next */
while ((rule = rule_context_next_rule (fc, rule, type))) {
@@ -634,7 +638,6 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException
filter_rule_build_code (rule, fsearch);
filter_filter_build_action ((FilterFilter *) rule, faction);
-
camel_filter_driver_add_rule (driver, rule->name, fsearch->str, faction->str);
}
@@ -755,6 +758,8 @@ mail_session_init (const char *base_directory)
camel_dir = g_strdup_printf ("%s/mail", base_directory);
camel_session_construct (session, camel_dir);
+
+ session->junk_plugin = CAMEL_JUNK_PLUGIN (em_junk_filter_get_plugin ());
/* The shell will tell us to go online. */
camel_session_set_online ((CamelSession *) session, FALSE);