From 2e60b6a4a21105bb4a1e2badd1be51b3e684d165 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 22 Nov 2011 17:53:07 -0500
Subject: Tweak GSettings schemas.

- Don't use the term "eplugin" for modules.

- Use the term "plugin" instead of "eplugin" for plugins.

- Split SpamAssassin settings into a separate schema.
---
 data/org.gnome.evolution.mail.gschema.xml.in | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'data/org.gnome.evolution.mail.gschema.xml.in')

diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 830894ca6d..fdd1e14947 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -520,31 +520,6 @@
       <_summary>The default plugin for Junk hook</_summary>
       <_description>This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins.</_description>
     </key>
-    <key name="junk-sa-local-only" type="b">
-      <default>true</default>
-      <_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>
-- 
cgit v1.2.3