aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/em-junk-filter.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9644d88135..18628947d1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2004-01-12 Radek Doulik <rodo@ximian.com>
+ * em-junk-filter.c (em_junk_sa_check_junk): use
+ mail_session_get_sa_use_daemon
+
* mail-session.c: added SA prefs
(mail_session_get_sa_local_only): new helper method
(mail_session_set_sa_local_only): ditto
diff --git a/mail/em-junk-filter.c b/mail/em-junk-filter.c
index d81b04feda..0491d58823 100644
--- a/mail/em-junk-filter.c
+++ b/mail/em-junk-filter.c
@@ -275,7 +275,7 @@ em_junk_sa_check_junk (CamelMimeMessage *msg)
if (!em_junk_sa_is_available ())
return FALSE;
- args [2] = em_junk_sa_use_spamc
+ args [2] = (em_junk_sa_use_spamc && mail_session_get_sa_use_daemon ())
? (em_junk_sa_spamd_port == -1
? g_strdup ("spamc -c") /* Exit with a non-zero exit code if the
tested message was junk */