aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-03-13 19:24:56 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-03-13 19:24:56 +0800
commit4c98736f86d1fe10d16651d8fa7e7452d3c75b31 (patch)
tree6cb059de983d302c597a8ad1373e9dfdcd959800
parentf72f86f2397e8b16b36b75f6531a3e239ea16d0a (diff)
downloadgsoc2013-evolution-4c98736f86d1fe10d16651d8fa7e7452d3c75b31.tar.gz
gsoc2013-evolution-4c98736f86d1fe10d16651d8fa7e7452d3c75b31.tar.zst
gsoc2013-evolution-4c98736f86d1fe10d16651d8fa7e7452d3c75b31.zip
** Fix for bug #515786
2008-03-13 Milan Crha <mcrha@redhat.com> ** Fix for bug #515786 * plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml: * plugins/sa-junk-plugin/em-junk-filter.c: (org_gnome_sa_use_remote_tests): * mail/em-migrate.c: (em_migrate), (em_update_sa_junk_setting_2_23): Fix misspelled SpamAssassin word. svn path=/trunk/; revision=35183
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-migrate.c28
-rw-r--r--plugins/sa-junk-plugin/ChangeLog8
-rw-r--r--plugins/sa-junk-plugin/em-junk-filter.c2
-rw-r--r--plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml2
5 files changed, 45 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 54a820c72b..cbc245e9b9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
2008-03-13 Milan Crha <mcrha@redhat.com>
+ ** Part of fix for bug #515786
+
+ * em-migrate.c: (em_migrate), (em_update_sa_junk_setting_2_23):
+ Fix misspelled SpamAssassin word.
+
+2008-03-13 Milan Crha <mcrha@redhat.com>
+
** Fix for bug #273177
* em-utils.h: (em_utils_add_vcard):
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index f038a8f640..c0dc7797f0 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -2813,6 +2813,31 @@ em_update_message_notify_settings_2_21 (void)
g_object_unref (client);
}
+/* fixing typo in SpamAssassin name */
+static void
+em_update_sa_junk_setting_2_23 (void)
+{
+ GConfClient *client;
+ GConfValue *key;
+
+ client = gconf_client_get_default ();
+
+ key = gconf_client_get (client, "/apps/evolution/mail/junk/default_plugin", NULL);
+ if (key) {
+ const char *str = gconf_value_get_string (key);
+
+ if (str && strcmp (str, "Spamassasin") == 0)
+ gconf_client_set_string (client, "/apps/evolution/mail/junk/default_plugin", "SpamAssassin", NULL);
+
+ gconf_value_free (key);
+ g_object_unref (client);
+
+ return;
+ }
+
+ g_object_unref (client);
+}
+
int
em_migrate (const char *evolution_dir, int major, int minor, int revision, CamelException *ex)
{
@@ -2902,6 +2927,9 @@ em_migrate (const char *evolution_dir, int major, int minor, int revision, Camel
if (major < 2 || (major == 2 && minor < 22))
em_update_message_notify_settings_2_21 ();
+ if (major < 2 || (major == 2 && minor < 24))
+ em_update_sa_junk_setting_2_23 ();
+
#endif /* !G_OS_WIN32 */
return 0;
}
diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog
index e88a0c6094..0ad3407ce7 100644
--- a/plugins/sa-junk-plugin/ChangeLog
+++ b/plugins/sa-junk-plugin/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-13 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #515786
+
+ * org-gnome-sa-junk-plugin.eplug.xml:
+ * em-junk-filter.c: (org_gnome_sa_use_remote_tests):
+ Fix misspelled SpamAssassin word.
+
2007-11-26 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #499644
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index de294ad411..4e455e9b8e 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -845,7 +845,7 @@ GtkWidget *
org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
{
GtkWidget *check, *vbox, *label;
- char *text = g_strdup_printf (" <small>%s</small>", _("This will make Spamassasin more reliable, but slower"));
+ char *text = g_strdup_printf (" <small>%s</small>", _("This will make SpamAssassin more reliable, but slower"));
guint i = ((GtkTable *)data->parent)->nrows;
if (data->old)
diff --git a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
index 7dee4cd2d3..83215e718c 100644
--- a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
+++ b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
@@ -7,7 +7,7 @@
<author name="Vivek Jain" email="jvivek@novell.com"/>
<hook class="org.gnome.evolution.mail.junk:1.0">
<group id="EMJunk" >
- <item name="Spamassasin"
+ <item name="SpamAssassin"
check_junk="em_junk_sa_check_junk"
report_junk="em_junk_sa_report_junk"
report_non_junk="em_junk_sa_report_non_junk"