+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
( 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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=109
+EXTRA_VERSION=110
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
}
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;
}
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;