2011-01-21 [colin] 3.7.8cvs39
authorColin Leroy <colin@colino.net>
Fri, 21 Jan 2011 08:59:36 +0000 (08:59 +0000)
committerColin Leroy <colin@colino.net>
Fri, 21 Jan 2011 08:59:36 +0000 (08:59 +0000)
* src/plugins/spamassassin/spamassassin.c
Fix sa-learn when offline (its command line parsing is
space-dependant). Patch by Wolfgang Lorenz

ChangeLog
PATCHSETS
configure.ac
src/plugins/spamassassin/spamassassin.c

index 8d73404..2a26418 100644 (file)
--- 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
index 2ab833e..46fe758 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 951ae27..efbbb9c 100644 (file)
@@ -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=
 
index 5bb4ff0..b15b33e 100644 (file)
@@ -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 */