talons

commit df1965d163c4e805537f2e4f736c55eef882b2e3
parent 18f0206f603c195264dd87e53b0646900cc6f708
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 21 Jan 2011 08:59:36 +0000

2011-01-21 [colin]	3.7.8cvs39

	* src/plugins/spamassassin/spamassassin.c
		Fix sa-learn when offline (its command line parsing is
		space-dependant). Patch by Wolfgang Lorenz

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/plugins/spamassassin/spamassassin.c
 | 
8
++++----

4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-21 [colin]	3.7.8cvs39
+
+	* src/plugins/spamassassin/spamassassin.c
+		Fix sa-learn when offline (its command line parsing is
+		space-dependant). Patch by Wolfgang Lorenz
+
 2011-01-19 [pawel]	3.7.8cvs38
 
 	* claws-mail.desktop
diff --git a/PATCHSETS b/PATCHSETS
@@ -4112,3 +4112,4 @@
 ( cvs diff -u -r 1.52.2.80 -r 1.52.2.81 src/prefs_folder_item.c;  ) > 3.7.8cvs36.patchset
 ( cvs diff -u -r 1.11.2.28 -r 1.11.2.29 src/common/smtp.c;  ) > 3.7.8cvs37.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 claws-mail.desktop;  ) > 3.7.8cvs38.patchset
+( cvs diff -u -r 1.18.2.63 -r 1.18.2.64 src/plugins/spamassassin/spamassassin.c;  ) > 3.7.8cvs39.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
@@ -442,9 +442,9 @@ int spamassassin_learn(MsgInfo *msginfo, GSList *msglist, gboolean spam)
 								spamc_wrapper, " ", file, NULL);
 			}
 		} else {
-			cmd = g_strdup_printf("sa-learn -u %s %s %s %s",
+			cmd = g_strdup_printf("sa-learn -u %s%s %s %s",
 							config.username,
-							prefs_common.work_offline?"-L":"",
+							prefs_common.work_offline?" -L":"",
 							spam?"--spam":"--ham", file);
 		}
 	}
@@ -476,9 +476,9 @@ int spamassassin_learn(MsgInfo *msginfo, GSList *msglist, gboolean spam)
 			g_free(spamc_wrapper);
 			return 0;
 		} else {
-			cmd = g_strdup_printf("sa-learn -u %s %s %s",
+			cmd = g_strdup_printf("sa-learn -u %s%s %s",
 					config.username,
-					prefs_common.work_offline?"-L":"",
+					prefs_common.work_offline?" -L":"",
 					spam?"--spam":"--ham");
 
 			/* concatenate all message tmpfiles to the sa-learn command-line */