aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-11-23 06:53:07 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-11-23 09:42:56 +0800
commit2e60b6a4a21105bb4a1e2badd1be51b3e684d165 (patch)
treed3cfea8c8660785403ebce50fbedcd7cae23b6cb /modules
parentadf6645d525842692ca625a278e41a66cd02d2b6 (diff)
downloadgsoc2013-evolution-2e60b6a4a21105bb4a1e2badd1be51b3e684d165.tar
gsoc2013-evolution-2e60b6a4a21105bb4a1e2badd1be51b3e684d165.tar.gz
gsoc2013-evolution-2e60b6a4a21105bb4a1e2badd1be51b3e684d165.tar.bz2
gsoc2013-evolution-2e60b6a4a21105bb4a1e2badd1be51b3e684d165.tar.lz
gsoc2013-evolution-2e60b6a4a21105bb4a1e2badd1be51b3e684d165.tar.xz
gsoc2013-evolution-2e60b6a4a21105bb4a1e2badd1be51b3e684d165.tar.zst
gsoc2013-evolution-2e60b6a4a21105bb4a1e2badd1be51b3e684d165.zip
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.
Diffstat (limited to 'modules')
-rw-r--r--modules/bogofilter/evolution-bogofilter.c2
-rw-r--r--modules/spamassassin/evolution-spamassassin.c29
2 files changed, 23 insertions, 8 deletions
diff --git a/modules/bogofilter/evolution-bogofilter.c b/modules/bogofilter/evolution-bogofilter.c
index 0b6340296a..74c1d362ca 100644
--- a/modules/bogofilter/evolution-bogofilter.c
+++ b/modules/bogofilter/evolution-bogofilter.c
@@ -506,7 +506,7 @@ e_bogofilter_init (EBogofilter *extension)
{
GSettings *settings;
- settings = g_settings_new ("org.gnome.evolution.eplugin.bogo-junk");
+ settings = g_settings_new ("org.gnome.evolution.bogofilter");
g_settings_bind (
settings, "utf8-for-spam-filter",
G_OBJECT (extension), "convert-to-unicode",
diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
index 7381e4a2ec..e722b0cc2e 100644
--- a/modules/spamassassin/evolution-spamassassin.c
+++ b/modules/spamassassin/evolution-spamassassin.c
@@ -1153,13 +1153,28 @@ e_spam_assassin_init (ESpamAssassin *extension)
* need to be properties anymore. GConfBridge is
* just easier to deal with than GConfClient. */
- settings = g_settings_new ("org.gnome.evolution.mail");
-
- g_settings_bind (settings, "junk-sa-local-only", G_OBJECT (extension), "local-only", G_SETTINGS_BIND_DEFAULT);
- g_settings_bind (settings, "junk-sa-spamc-binary", G_OBJECT (extension), "spamc-binary", G_SETTINGS_BIND_DEFAULT);
- g_settings_bind (settings, "junk-sa-spamd-binary", G_OBJECT (extension), "spamd-binary", G_SETTINGS_BIND_DEFAULT);
- g_settings_bind (settings, "junk-sa-socket-path", G_OBJECT (extension), "socket-path", G_SETTINGS_BIND_DEFAULT);
- g_settings_bind (settings, "junk-sa-use-daemon", G_OBJECT (extension), "use-daemon", G_SETTINGS_BIND_DEFAULT);
+ settings = g_settings_new ("org.gnome.evolution.spamassassin");
+
+ g_settings_bind (
+ settings, "local-only",
+ G_OBJECT (extension), "local-only",
+ G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (
+ settings, "spamc-binary",
+ G_OBJECT (extension), "spamc-binary",
+ G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (
+ settings, "spamd-binary",
+ G_OBJECT (extension), "spamd-binary",
+ G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (
+ settings, "socket-path",
+ G_OBJECT (extension), "socket-path",
+ G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (
+ settings, "use-daemon",
+ G_OBJECT (extension), "use-daemon",
+ G_SETTINGS_BIND_DEFAULT);
g_object_unref (settings);