aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-11-02 00:26:07 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-11-02 00:26:07 +0800
commitfa4a42d741fade66d51857fb2653e27e347aef80 (patch)
treebbb26a574f30fea5fb4d7cfda0e62890ce71bf4c /data
parentf31ecdfc22646e5c0b6979954cf5861a9fb68722 (diff)
downloadgsoc2013-evolution-fa4a42d741fade66d51857fb2653e27e347aef80.tar.gz
gsoc2013-evolution-fa4a42d741fade66d51857fb2653e27e347aef80.tar.zst
gsoc2013-evolution-fa4a42d741fade66d51857fb2653e27e347aef80.zip
Migrate SA extension to GSettings
Diffstat (limited to 'data')
-rw-r--r--data/evolution.convert3
-rw-r--r--data/org.gnome.evolution.mail.gschema.xml.in15
2 files changed, 18 insertions, 0 deletions
diff --git a/data/evolution.convert b/data/evolution.convert
index 780ba5653c..992286f88d 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -132,6 +132,9 @@ junk-empty-on-exit-days = /apps/evolution/mail/junk/empty_on_exit_days
junk-lookup-addressbook = /apps/evolution/mail/junk/lookup_addressbook
junk-lookup-addressbook-local-only = /apps/evolution/mail/junk/lookup_addressbook_local_only
junk-sa-local-only = /apps/evolution/mail/junk/sa/local_only
+junk-sa-spamc-binary = /apps/evolution/mail/junk/sa/spamc_binary
+junk-sa-spamd-binary = /apps/evolution/mail/junk/sa/spamd_binary
+junk-sa-socket-path = "/apps/evolution/mail/junk/sa/socket_path
junk-sa-use-daemon = /apps/evolution/mail/junk/sa/use_daemon
labels = /apps/evolution/mail/labels
layout = /apps/evolution/mail/display/layout
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 35092ccfff..30884ae571 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -500,11 +500,26 @@
<_summary>Use only local spam tests.</_summary>
<_description>Use only the local spam tests (no DNS).</_description>
</key>
+ <key name="junk-sa-socket-path" type="s">
+ <default>''</default>
+ <_summary>Socket path for SpamAssassin</_summary>
+ <_description>Socket path for SpamAssassin</_description>
+ </key>
<key name="junk-sa-use-daemon" type="b">
<default>true</default>
<_summary>Use SpamAssassin daemon and client</_summary>
<_description>Use SpamAssassin daemon and client (spamc/spamd).</_description>
</key>
+ <key name="junk-sa-spamc-binary" type="s">
+ <default>'spamc'</default>
+ <_summary>SpamAssassin client binary</_summary>
+ <_description>SpamAssassin client binary</_description>
+ </key>
+ <key name="junk-sa-spamd-binary" type="s">
+ <default>'spamd'</default>
+ <_summary>SpamAssassin daemon binary</_summary>
+ <_description>SpamAssassin daemon binary</_description>
+ </key>
<key name="junk-lookup-addressbook" type="b">
<default>false</default>
<_summary>Determines whether to lookup in address book for sender email</_summary>