evolution r36452 - trunk/plugins/sa-junk-plugin

[pwithnall svn gnome org]

Author: pwithnall
Date: Thu Sep 25 17:01:07 2008
New Revision: 36452
URL: http://svn.gnome.org/viewvc/evolution?rev=36452&view=rev

Log:
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".



Modified:
   trunk/plugins/sa-junk-plugin/ChangeLog
   trunk/plugins/sa-junk-plugin/em-junk-filter.c
   trunk/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml

Modified: trunk/plugins/sa-junk-plugin/em-junk-filter.c
==============================================================================
--- trunk/plugins/sa-junk-plugin/em-junk-filter.c	(original)
+++ trunk/plugins/sa-junk-plugin/em-junk-filter.c	Thu Sep 25 17:01:07 2008
@@ -138,7 +138,7 @@
 
 	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 @@
 
 	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 @@
 				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_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;

Modified: trunk/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
==============================================================================
--- trunk/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml	(original)
+++ trunk/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml	Thu Sep 25 17:01:07 2008
@@ -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>