From 2f9a448a3a3a7274843a727c2a705fb8cfc94d86 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Sun, 13 Aug 2006 16:36:51 +0000 Subject: [PATCH] 2006-08-13 [wwp] 2.4.0cvs44 * src/plugins/spamassassin/spamassassin.c fix capitalization of "SpamAssassin" in some debug, log and dialog messages. --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/spamassassin/spamassassin.c | 14 +++++++------- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e17c726e8..78266ed5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-08-13 [wwp] 2.4.0cvs44 + + * src/plugins/spamassassin/spamassassin.c + fix capitalization of "SpamAssassin" in some debug, log and + dialog messages. + 2006-08-13 [paul] 2.4.0cvs43 * src/editldap.c diff --git a/PATCHSETS b/PATCHSETS index 22cfe6a68..784cd8480 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1735,3 +1735,4 @@ ( cvs diff -u -r 1.382.2.299 -r 1.382.2.300 src/compose.c; cvs diff -u -r 1.274.2.136 -r 1.274.2.137 src/mainwindow.c; cvs diff -u -r 1.39.2.19 -r 1.39.2.20 src/mainwindow.h; cvs diff -u -r 1.150.2.70 -r 1.150.2.71 src/procmsg.c; cvs diff -u -r 1.60.2.30 -r 1.60.2.31 src/procmsg.h; cvs diff -u -r 1.395.2.228 -r 1.395.2.229 src/summaryview.c; cvs diff -u -r 1.43.2.48 -r 1.43.2.49 src/toolbar.c; ) > 2.4.0cvs41.patchset ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 manual/plugins.xml; ) > 2.4.0cvs42.patchset ( cvs diff -u -r 1.8.2.13 -r 1.8.2.14 src/editldap.c; cvs diff -u -r 1.105.2.63 -r 1.105.2.64 src/prefs_account.c; ) > 2.4.0cvs43.patchset +( cvs diff -u -r 1.18.2.35 -r 1.18.2.36 src/plugins/spamassassin/spamassassin.c; ) > 2.4.0cvs44.patchset diff --git a/configure.ac b/configure.ac index ddc227328..c0f2957f3 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=43 +EXTRA_VERSION=44 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c index 07fc7aa54..dca3c1fd9 100644 --- a/src/plugins/spamassassin/spamassassin.c +++ b/src/plugins/spamassassin/spamassassin.c @@ -156,7 +156,7 @@ static MsgStatus msg_is_spam(FILE *fp) } if (transport_setup(&trans, flags) != EX_OK) { - log_error(_("Spamassassin plugin couldn't connect to spamd.\n")); + log_error(_("SpamAssassin plugin couldn't connect to spamd.\n")); debug_print("failed to setup transport\n"); return MSG_FILTERING_ERROR; } @@ -172,7 +172,7 @@ static MsgStatus msg_is_spam(FILE *fp) } if (message_filter(&trans, config.username, flags, &m) != EX_OK) { - log_error(_("Spamassassin plugin filtering failed.\n")); + log_error(_("SpamAssassin plugin filtering failed.\n")); debug_print("filtering the message failed\n"); message_cleanup(&m); return MSG_FILTERING_ERROR; @@ -198,7 +198,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data) /* SPAMASSASSIN_DISABLED : keep test for compatibility purpose */ if (!config.enable || config.transport == SPAMASSASSIN_DISABLED) { - log_error(_("Spamassassin plugin is disabled by its preferences.\n")); + log_error(_("SpamAssassin plugin is disabled by its preferences.\n")); return FALSE; } debug_print("Filtering message %d\n", msginfo->msgnum); @@ -272,7 +272,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data) if (error) { if (!warned_error) { - alertpanel_error(_("The Spamassassin plugin couldn't filter " + alertpanel_error(_("The SpamAssassin plugin couldn't filter " "a message. The probable error cause is " "an unreachable spamd daemon. Please make " "sure spamd is running and accessible.")); @@ -477,14 +477,14 @@ gint plugin_init(gchar **error) } spamassassin_gtk_init(); - debug_print("Spamassassin plugin loaded\n"); + debug_print("SpamAssassin plugin loaded\n"); if (config.process_emails) { spamassassin_register_hook(); } if (!config.enable || config.transport == SPAMASSASSIN_DISABLED) { - log_error(_("Spamassassin plugin is loaded but disabled by its preferences.\n")); + log_error(_("SpamAssassin plugin is loaded but disabled by its preferences.\n")); } else { if (config.transport == SPAMASSASSIN_TRANSPORT_TCP) @@ -507,7 +507,7 @@ void plugin_done(void) spamassassin_gtk_done(); procmsg_unregister_spam_learner(spamassassin_learn); procmsg_spam_set_folder(NULL); - debug_print("Spamassassin plugin unloaded\n"); + debug_print("SpamAssassin plugin unloaded\n"); } const gchar *plugin_name(void) -- 2.25.1