[evolution-patches] [Mailer] Fix for Bug #325210 [sa-junk-plugin]

["shi pu sun com" <Shi Pu Sun COM>]

hey,

	pls ignore last mail. i'm so sorry for not adding the attach.


	Evolution-plugins junk learn can not work with SpamAssassin3.0 because
the sync option of "sa-learn" needed after SpamAssassin3.0 is "--sync"
and "--no-sync", but evolution-plugins assumes that junk learning works
based on SpamAssassin 2.x, whose sync option of sa-learn is "--rebuild"
and "--no-rebuild". 

        so i did the patch to resolve this problem. it analysize the
output of "sa-learn --version", and get the main version No.. 
        
	Anyone who could do me a favor to review it for me?

regards,

jerry
	

Index: plugins/sa-junk-plugin/em-junk-filter.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/sa-junk-plugin/em-junk-filter.c,v
retrieving revision 1.4.2.1
diff -u -p -r1.4.2.1 em-junk-filter.c
--- plugins/sa-junk-plugin/em-junk-filter.c	3 Oct 2005 08:53:24 -0000	1.4.2.1
+++ plugins/sa-junk-plugin/em-junk-filter.c	29 Dec 2005 09:18:59 -0000
@@ -73,6 +73,8 @@ static gboolean em_junk_sa_use_spamc = F
 static gboolean em_junk_sa_available = FALSE;
 static gboolean em_junk_sa_system_spamd_available = FALSE;
 static gboolean em_junk_sa_new_daemon_started = FALSE;
+static gboolean em_junk_sa_checked_spamassassin_version = FALSE;
+static guint em_junk_sa_spamassassin_version = 0;
 static char *em_junk_sa_socket_path = NULL;
 static char *em_junk_sa_spamd_pidfile = NULL;
 static char *em_junk_sa_spamc_binary = NULL;
@@ -586,12 +588,53 @@ em_junk_sa_check_junk(EPlugin *ep, EMJun
 	return rv;
 }
 
+static guint
+get_spamassassin_version ()
+{	
+	GByteArray *out = NULL;
+	int i;
+	
+	char * argv[3] = {
+		"sa-learn",
+		"--version",
+		NULL
+	};
+	
+	if (!em_junk_sa_checked_spamassassin_version){
+		out = g_byte_array_new ();
+		
+		if (pipe_to_sa_full (NULL, NULL, argv, -1, 1, out) != 0){
+			if(out)
+				g_byte_array_free (out, TRUE);
+			return em_junk_sa_spamassassin_version;
+		}
+	
+		if(out->len > 0){
+			for(i = 0; i < out->len; i++){
+				if(g_ascii_isdigit (out->data[i])){
+					em_junk_sa_spamassassin_version = (out->data[i] - '0');
+					em_junk_sa_checked_spamassassin_version = TRUE;
+					break;
+				}
+			}	
+		}
+
+
+		if(out)
+			g_byte_array_free (out, TRUE);
+	}
+
+	return em_junk_sa_spamassassin_version;
+}
+
 void
 em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target)
 {
+	char *sync_op = ((get_spamassassin_version () >= 3) ? "--no-sync": "--no-rebuild");
 	char *argv[6] = {
 		"sa-learn",
-		"--no-rebuild",
+		sync_op,
 		"--spam",
 		"--single",
 		NULL,
@@ -618,9 +661,10 @@ em_junk_sa_report_junk (EPlugin *ep, EMJ
 void
 em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target)
 {
+	char *sync_op = ((get_spamassassin_version () >= 3) ? "--no-sync": "--no-rebuild");
 	char *argv[6] = {
 		"sa-learn",
-		"--no-rebuild",
+		sync_op,
 		"--ham",
 		"--single",
 		NULL,
@@ -643,9 +687,10 @@ em_junk_sa_report_non_junk (EPlugin *ep,
 void
 em_junk_sa_commit_reports (EPlugin *ep, EMJunkHookTarget *target)
 {
+	char *sync_op = ((get_spamassassin_version () >= 3) ? "--sync": "--rebuild");
 	char *argv[4] = {
 		"sa-learn",
-		"--rebuild",
+		sync_op,
 		NULL,
 		NULL
 	};