diff options
| -rw-r--r-- | plugins/sa-junk-plugin/ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/sa-junk-plugin/em-junk-filter.c | 8 | ||||
| -rw-r--r-- | plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog index 70fa37ad47..1cea292576 100644 --- a/plugins/sa-junk-plugin/ChangeLog +++ b/plugins/sa-junk-plugin/ChangeLog @@ -1,3 +1,11 @@ +2008-09-25 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #551121 + + * em-junk-filter.c (pipe_to_sa_full), (em_junk_sa_respawn_spamd): + * org-gnome-sa-junk-plugin.eplug.xml: Standardise use of + "SpamAssassin" vs. "spamassassin" or "Spamassassin". + 2008-09-12 Milan Crha <mcrha@redhat.com> ** Fix for bug #505016 diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 7ab8feb614..ba08a37a2f 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -138,7 +138,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, if (pipe (fds) == -1) { errnosav = errno; - d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno))); + d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno))); g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav)); errno = errnosav; return rv_err; @@ -146,7 +146,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, if (output_buffer && pipe (out_fds) == -1) { errnosav = errno; - d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno))); + d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno))); g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav)); close (fds [0]); close (fds [1]); @@ -243,7 +243,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, result = waitpid (pid, &status, WNOHANG); g_set_error (error, EM_JUNK_ERROR, -2, _("SpamAssassin child process does not respond, killing...")); } else - g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Spamassassin child process interrupted, terminating...")); + g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for SpamAssassin child process interrupted, terminating...")); } if (result != -1 && WIFEXITED (status)) @@ -541,7 +541,7 @@ em_junk_sa_respawn_spamd () em_junk_sa_kill_spamd (); if (em_junk_sa_check_respawn_too_fast ()) { - g_warning ("respawning of spamd too fast => fallback to use spamassassin directly"); + g_warning ("respawning of spamd too fast => fallback to use SpamAssassin directly"); em_junk_sa_use_spamc = em_junk_sa_use_daemon = FALSE; return FALSE; 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 83215e718c..4277040fa5 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 @@ -18,7 +18,7 @@ <!-- hook into the 'mail properties' menu --> <hook class="org.gnome.evolution.mail.config:1.0"> <group target="prefs" id="org.gnome.evolution.mail.prefs"> - <item type="section_table" path="40.junk/10.options" _label="Spamassassin Options"/> + <item type="section_table" path="40.junk/10.options" _label="SpamAssassin Options"/> <item type="item_table" path="40.junk/20.options" factory="org_gnome_sa_use_remote_tests"/> </group> </hook> |