diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-07-08 11:51:24 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-07-08 12:08:54 +0800 |
| commit | 3b8a9ed601e38a6a0d94fa661fccd4a5000f4b0e (patch) | |
| tree | 5ce2ab50bdf40b3b9a0204083bc5d8b330254e4d /data | |
| parent | 5c866713c795795ef46cc90ed95ed7de98152971 (diff) | |
| download | gsoc2013-evolution-3b8a9ed601e38a6a0d94fa661fccd4a5000f4b0e.tar gsoc2013-evolution-3b8a9ed601e38a6a0d94fa661fccd4a5000f4b0e.tar.gz gsoc2013-evolution-3b8a9ed601e38a6a0d94fa661fccd4a5000f4b0e.tar.bz2 gsoc2013-evolution-3b8a9ed601e38a6a0d94fa661fccd4a5000f4b0e.tar.lz gsoc2013-evolution-3b8a9ed601e38a6a0d94fa661fccd4a5000f4b0e.tar.xz gsoc2013-evolution-3b8a9ed601e38a6a0d94fa661fccd4a5000f4b0e.tar.zst gsoc2013-evolution-3b8a9ed601e38a6a0d94fa661fccd4a5000f4b0e.zip | |
Bug 703490 - Stop invoking spamc, just use spamassassin
SpamAssassin is clearly not intended for use by mail clients, as
evidenced by the number of backflips Evolution's SA module still has to
do just to detect the presence and nature of a running spamd (a problem
which D-Bus solved a decade ago), and recent SA developer comments.
In lieu of removing SA support entirely, remove all the crazy GSettings
that are (thankfully) not exposed in the UI and relegate Evolution's SA
integration to only the most basic usage (spamassassin / sa-learn).
Users are better off with Bogofilter anyway. Leave SpamAssassin for
mail servers.
Diffstat (limited to 'data')
| -rw-r--r-- | data/evolution.convert | 4 | ||||
| -rw-r--r-- | data/org.gnome.evolution.spamassassin.gschema.xml.in | 10 |
2 files changed, 0 insertions, 14 deletions
diff --git a/data/evolution.convert b/data/evolution.convert index 8ea30a6aaa..4ef1a71188 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -229,10 +229,6 @@ utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode [org.gnome.evolution.spamassassin] local-only = /apps/evolution/mail/junk/sa/local_only -socket-path = /apps/evolution/mail/junk/sa/socket_path -spamc-binary = /apps/evolution/mail/junk/sa/spamc_binary -spamd-binary = /apps/evolution/mail/junk/sa/spamd_binary -use-daemon = /apps/evolution/mail/junk/sa/use_daemon [org.gnome.evolution.plugin.attachment-reminder] attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues diff --git a/data/org.gnome.evolution.spamassassin.gschema.xml.in b/data/org.gnome.evolution.spamassassin.gschema.xml.in index e0daba1831..5bf3599447 100644 --- a/data/org.gnome.evolution.spamassassin.gschema.xml.in +++ b/data/org.gnome.evolution.spamassassin.gschema.xml.in @@ -5,15 +5,5 @@ <_summary>Use only local spam tests.</_summary> <_description>Use only the local spam tests (no DNS).</_description> </key> - <key name="socket-path" type="s"> - <default>''</default> - <_summary>Socket path for SpamAssassin</_summary> - <_description>Socket path for SpamAssassin</_description> - </key> - <key name="use-daemon" type="b"> - <default>true</default> - <_summary>Use SpamAssassin daemon and client</_summary> - <_description>Use spamc and spamd programs, if available.</_description> - </key> </schema> </schemalist> |