From: Colin Leroy Date: Mon, 27 Feb 2006 17:55:49 +0000 (+0000) Subject: 2006-02-27 [colin] 2.0.0cvs85 X-Git-Tag: REL_2_1_0~109 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=3a6654aa187736722ea13dfbdaac83761014852b 2006-02-27 [colin] 2.0.0cvs85 * src/plugins/spamassassin/spamassassin.c Fix sa-learn call when offline --- diff --git a/ChangeLog b/ChangeLog index cccb77974..c0d73c44c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-27 [colin] 2.0.0cvs85 + + * src/plugins/spamassassin/spamassassin.c + Fix sa-learn call when offline + 2006-02-27 [colin] 2.0.0cvs84 * configure.ac diff --git a/PATCHSETS b/PATCHSETS index 576e0763f..30feb1425 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1268,3 +1268,4 @@ ( cvs diff -u -r 1.155.2.35 -r 1.155.2.36 src/Makefile.am; cvs diff -u -r 1.274.2.99 -r 1.274.2.100 src/mainwindow.c; cvs diff -u -r 1.39.2.12 -r 1.39.2.13 src/mainwindow.h; cvs diff -u -r 1.150.2.51 -r 1.150.2.52 src/procmsg.c; cvs diff -u -r 1.60.2.23 -r 1.60.2.24 src/procmsg.h; cvs diff -u -r 1.25.2.20 -r 1.25.2.21 src/stock_pixmap.c; cvs diff -u -r 1.18.2.14 -r 1.18.2.15 src/stock_pixmap.h; cvs diff -u -r 1.395.2.173 -r 1.395.2.174 src/summaryview.c; cvs diff -u -r 1.68.2.15 -r 1.68.2.16 src/summaryview.h; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/icon_legend.c; diff -u /dev/null src/pixmaps/spam.xpm; cvs diff -u -r 1.18.2.17 -r 1.18.2.18 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.23.2.18 -r 1.23.2.19 src/plugins/spamassassin/spamassassin_gtk.c; ) > 2.0.0cvs82.patchset ( cvs diff -u -r 1.150.2.52 -r 1.150.2.53 src/procmsg.c; cvs diff -u -r 1.395.2.174 -r 1.395.2.175 src/summaryview.c; cvs diff -u -r 1.68.2.16 -r 1.68.2.17 src/summaryview.h; cvs diff -u -r 1.18.2.18 -r 1.18.2.19 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/plugins/spamassassin/spamassassin.h; cvs diff -u -r 1.23.2.19 -r 1.23.2.20 src/plugins/spamassassin/spamassassin_gtk.c; ) > 2.0.0cvs83.patchset ( cvs diff -u -r 1.654.2.1313 -r 1.654.2.1314 configure.ac; cvs diff -u -r 1.155.2.36 -r 1.155.2.37 src/Makefile.am; cvs diff -u -r 1.274.2.100 -r 1.274.2.101 src/mainwindow.c; cvs diff -u -r 1.39.2.13 -r 1.39.2.14 src/mainwindow.h; cvs diff -u -r 1.94.2.77 -r 1.94.2.78 src/messageview.c; cvs diff -u -r 1.19.2.6 -r 1.19.2.7 src/messageview.h; cvs diff -u -r 1.30.2.25 -r 1.30.2.26 src/prefs_toolbar.c; cvs diff -u -r 1.150.2.53 -r 1.150.2.54 src/procmsg.c; cvs diff -u -r 1.25.2.21 -r 1.25.2.22 src/stock_pixmap.c; cvs diff -u -r 1.18.2.15 -r 1.18.2.16 src/stock_pixmap.h; cvs diff -u -r 1.395.2.175 -r 1.395.2.176 src/summaryview.c; cvs diff -u -r 1.43.2.39 -r 1.43.2.40 src/toolbar.c; cvs diff -u -r 1.19.2.8 -r 1.19.2.9 src/toolbar.h; diff -u /dev/null src/pixmaps/ham_btn.xpm; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/spam.xpm; diff -u /dev/null src/pixmaps/spam_btn.xpm; cvs diff -u -r 1.18.2.19 -r 1.18.2.20 src/plugins/spamassassin/spamassassin.c; ) > 2.0.0cvs84.patchset +( cvs diff -u -r 1.18.2.20 -r 1.18.2.21 src/plugins/spamassassin/spamassassin.c; ) > 2.0.0cvs85.patchset diff --git a/configure.ac b/configure.ac index 16c0daa39..1b2dab290 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=84 +EXTRA_VERSION=85 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c index 6dd257e49..191c7130f 100644 --- a/src/plugins/spamassassin/spamassassin.c +++ b/src/plugins/spamassassin/spamassassin.c @@ -275,7 +275,9 @@ void spamassassin_learn(MsgInfo *msginfo, GSList *msglist, gboolean spam) if (msglist) { GSList *cur; MsgInfo *info; - cmd = g_strdup_printf("sa-learn %s", spam?"--spam":"--ham"); + cmd = g_strdup_printf("sa-learn %s %s", + prefs_common.work_offline?"-L":"", + spam?"--spam":"--ham"); for (cur = msglist; cur; cur = cur->next) { info = (MsgInfo *)cur->data; gchar *tmpcmd = NULL;