2006-08-29 [wwp] 2.4.0cvs110

	* src/plugins//bogofilter/bogofilter.c
	* src/plugins//spamassassin/spamassassin.c
		make the bogofilter/spamassassin filtering error dialogs at
        incorporation obey to the "don't popup error dialog on
        receive error" option. If disabled, feed the log window w/
        the error message.

diff --git a/ChangeLog b/ChangeLog
index 6a19ffff6316f3c3f470f542c7d411867d8e0a23..15220dce8df9c5977e3211770614d13a11ff741c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-29 [wwp]       2.4.0cvs110
+
+       * src/plugins//bogofilter/bogofilter.c
+       * src/plugins//spamassassin/spamassassin.c
+               make the bogofilter/spamassassin filtering error dialogs at
+        incorporation obey to the "don't popup error dialog on
+        receive error" option. If disabled, feed the log window w/
+        the error message.
+
 2006-08-29 [paul]
 
        2.5.0-rc2 released

diff --git a/PATCHSETS b/PATCHSETS
index 0e40ea229ae04ff6c9b1b0e1db0fff659bef8f8e..04d712029c8d952b62939464f96a9ddfd9dde21d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1801,3 +1801,4 @@
 ( cvs diff -u -r 1.213.2.110 -r 1.213.2.111 src/folder.c;  ) > 2.4.0cvs107.patchset
 ( cvs diff -u -r 1.26.2.26 -r 1.26.2.27 src/foldersel.c;  cvs diff -u -r 1.15.2.31 -r 1.15.2.32 src/summary_search.c;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/gtk/progressdialog.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/pgpcore/passphrase.c;  ) > 2.4.0cvs108.patchset
 ( cvs diff -u -r 1.24.2.13 -r 1.24.2.14 Makefile.am;  ) > 2.4.0cvs109.patchset
+( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins//bogofilter/bogofilter.c;  cvs diff -u -r 1.18.2.38 -r 1.18.2.39 src/plugins//spamassassin/spamassassin.c;  ) > 2.4.0cvs110.patchset

diff --git a/configure.ac b/configure.ac
index 24f436fc0cc05beb6acd0fb358cdfec6dfb22944..9d242fd510019bf96deaac341dfd0e6363f268b4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=109
+EXTRA_VERSION=110
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
index 9ddba9614f36c3091a7bdf33a3c3faaf615469c7..0490ef8a5f08dc195f6b1c746b7974bbd16d0e08 100644 (file)
--- a/src/plugins/bogofilter/bogofilter.c
+++ b/src/plugins/bogofilter/bogofilter.c
@@ -156,15 +156,22 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
        }
        
        if (status == 3) { /* I/O or other errors */
-               if (!warned_error) {
-                       alertpanel_error(_("The Bogofilter plugin couldn't filter "
+               gchar *msg = _("The Bogofilter plugin couldn't filter "
                                           "a message. The probable cause of the "
                                           "error is that it didn't learn from any mail.\n"
                                           "Use \"/Mark/Mark as spam\" and \"/Mark/Mark as "
                                           "ham\" to train Bogofilter with a few hundred "
-                                          "spam and ham messages."));
+                                          "spam and ham messages.");
+               if (!prefs_common.no_recv_err_panel) {
+                       if (!warned_error) {
+                               alertpanel_error(msg);
+                       }
+                       warned_error = TRUE;
+               } else {
+                       gchar *tmp = g_strdup_printf("%s\n", msg);
+                       log_error(tmp);
+                       g_free(tmp);
                }
-               warned_error = TRUE;
        }
        
        return FALSE;

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index e370303a3b4cba9600bd47451de49a148d5399a9..23085ac19e9033323e3c3503021806b5aa1c5e95 100644 (file)
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -271,13 +271,20 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
        }
        
        if (error) {
-               if (!warned_error) {
-                       alertpanel_error(_("The SpamAssassin plugin couldn't filter "
+               gchar *msg = _("The SpamAssassin plugin couldn't filter "
                                           "a message. The probable cause of the error "
                                           "is an unreachable spamd daemon. Please make "
-                                          "sure spamd is running and accessible."));
+                                          "sure spamd is running and accessible.");
+               if (!prefs_common.no_recv_err_panel) {
+                       if (!warned_error) {
+                               alertpanel_error(msg);
+                       }
+                       warned_error = TRUE;
+               } else {
+                       gchar *tmp = g_strdup_printf("%s\n", msg);
+                       log_error(tmp);
+                       g_free(tmp);
                }
-               warned_error = TRUE;
        }
        
        return FALSE;