From 461829b12c7107b25cdae4fa74cbf8265650ffd2 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Thu, 27 Oct 2005 07:50:57 +0000 Subject: [PATCH] 2005-10-27 [paul] 1.9.15cvs116 * src/plugins/clamav/clamav_plugin.c * src/plugins/dillo_viewer/dillo_viewer.c * src/plugins/mathml_viewer/mathml_viewer.c * src/plugins/pgpcore/plugin.c * src/plugins/pgpinline/plugin.c * src/plugins/pgpmime/plugin.c * src/plugins/spamassassin/spamassassin.c * src/plugins/trayicon/trayicon.c plugin_init() : make error messages more informative --- ChangeLog-gtk2.claws | 13 +++++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/clamav/clamav_plugin.c | 4 ++-- src/plugins/dillo_viewer/dillo_viewer.c | 4 ++-- src/plugins/mathml_viewer/mathml_viewer.c | 4 ++-- src/plugins/pgpcore/plugin.c | 4 ++-- src/plugins/pgpinline/plugin.c | 4 ++-- src/plugins/pgpmime/plugin.c | 4 ++-- src/plugins/spamassassin/spamassassin.c | 4 ++-- src/plugins/trayicon/trayicon.c | 4 ++-- 11 files changed, 31 insertions(+), 17 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 4d2a33e83..2e109fc01 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,16 @@ +2005-10-27 [paul] 1.9.15cvs116 + + * src/plugins/clamav/clamav_plugin.c + * src/plugins/dillo_viewer/dillo_viewer.c + * src/plugins/mathml_viewer/mathml_viewer.c + * src/plugins/pgpcore/plugin.c + * src/plugins/pgpinline/plugin.c + * src/plugins/pgpmime/plugin.c + * src/plugins/spamassassin/spamassassin.c + * src/plugins/trayicon/trayicon.c + plugin_init() : make error messages more + informative + 2005-10-26 [wwp] 1.9.15cvs115 * src/prefs_matcher.c diff --git a/PATCHSETS b/PATCHSETS index 0c4e84910..a63fa13bd 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -952,3 +952,4 @@ ( cvs diff -u -r 1.60.2.17 -r 1.60.2.18 po/es.po; ) > 1.9.15cvs113.patchset ( cvs diff -u -r 1.49.2.65 -r 1.49.2.66 src/procmime.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/gtksctree.c; cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/plugins/spamassassin/libspamc.c; cvs diff -u -r 1.18.2.9 -r 1.18.2.10 src/plugins/spamassassin/spamassassin.c; ) > 1.9.15cvs114.patchset ( cvs diff -u -r 1.43.2.28 -r 1.43.2.29 src/prefs_matcher.c; ) > 1.9.15cvs115.patchset +( cvs diff -u -r 1.13.2.10 -r 1.13.2.11 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.12.2.6 -r 1.12.2.7 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/plugins/mathml_viewer/mathml_viewer.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/plugin.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpinline/plugin.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.18.2.10 -r 1.18.2.11 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.14.2.25 -r 1.14.2.26 src/plugins/trayicon/trayicon.c; ) > 1.9.15cvs116.patchset diff --git a/configure.ac b/configure.ac index ed2fc5842..4af41f714 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=15 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=115 +EXTRA_VERSION=116 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c index e75a67fe8..c4fc5beda 100644 --- a/src/plugins/clamav/clamav_plugin.c +++ b/src/plugins/clamav/clamav_plugin.c @@ -190,12 +190,12 @@ gint plugin_init(gchar **error) gchar *rcpath; int no, ret; if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with"); + *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the ClamAV plugin was built with"); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) { - *error = g_strdup("Your sylpheed version is too old"); + *error = g_strdup("Your version of Sylpheed-Claws is too old for the ClamAV plugin"); return -1; } diff --git a/src/plugins/dillo_viewer/dillo_viewer.c b/src/plugins/dillo_viewer/dillo_viewer.c index 8ff8e6a3d..105a799cf 100644 --- a/src/plugins/dillo_viewer/dillo_viewer.c +++ b/src/plugins/dillo_viewer/dillo_viewer.c @@ -165,12 +165,12 @@ static MimeViewerFactory dillo_viewer_factory = gint plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with"); + *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the Dillo plugin was built with"); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) { - *error = g_strdup("Your sylpheed version is too old"); + *error = g_strdup("Your vesion of Sylpheed-Claws is too old for the Dillo plugin"); return -1; } diff --git a/src/plugins/mathml_viewer/mathml_viewer.c b/src/plugins/mathml_viewer/mathml_viewer.c index cff3f895a..59ab0b0c8 100644 --- a/src/plugins/mathml_viewer/mathml_viewer.c +++ b/src/plugins/mathml_viewer/mathml_viewer.c @@ -140,12 +140,12 @@ static MimeViewerFactory mathml_viewer_factory = gint plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with"); + *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the MathML plugin was built with"); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) { - *error = g_strdup("Your sylpheed version is too old"); + *error = g_strdup("Your version of Sylpheed-Claws is too old for the MathML plugin"); return -1; } diff --git a/src/plugins/pgpcore/plugin.c b/src/plugins/pgpcore/plugin.c index c9ab20b4b..900d45f44 100644 --- a/src/plugins/pgpcore/plugin.c +++ b/src/plugins/pgpcore/plugin.c @@ -33,12 +33,12 @@ gint plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with"); + *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the PGP/Core plugin was built with"); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(1, 9, 12, 40))) { - *error = g_strdup("Your sylpheed version is too old"); + *error = g_strdup("Your version of Sylpheed-Claws is too old for the PGP/Core plugin"); return -1; } diff --git a/src/plugins/pgpinline/plugin.c b/src/plugins/pgpinline/plugin.c index bc383a6ef..aec1f6625 100644 --- a/src/plugins/pgpinline/plugin.c +++ b/src/plugins/pgpinline/plugin.c @@ -33,12 +33,12 @@ gint plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with"); + *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the PGP/inline plugin was built with"); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(1, 9, 12, 49))) { - *error = g_strdup("Your sylpheed version is too old"); + *error = g_strdup("Your version of Sylpheed-Claws is too old for the PGP/inline plugin"); return -1; } diff --git a/src/plugins/pgpmime/plugin.c b/src/plugins/pgpmime/plugin.c index ec6117548..88f9aa767 100644 --- a/src/plugins/pgpmime/plugin.c +++ b/src/plugins/pgpmime/plugin.c @@ -32,12 +32,12 @@ gint plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with"); + *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the PGP/MIME plugin was built with"); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(1, 9, 12, 40))) { - *error = g_strdup("Your sylpheed version is too old"); + *error = g_strdup("Your version of Sylpheed-Claws is too old for the PGP/MIME plugin"); return -1; } diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c index 007523ad8..f88a911ec 100644 --- a/src/plugins/spamassassin/spamassassin.c +++ b/src/plugins/spamassassin/spamassassin.c @@ -281,12 +281,12 @@ gint plugin_init(gchar **error) gchar *rcpath; if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with"); + *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the SpamAssassin plugin was built with"); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) { - *error = g_strdup("Your sylpheed version is too old"); + *error = g_strdup("Your version of Sylpheed-Claws is too old for the SpamAssassin plugin"); return -1; } diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c index e44593ef7..f8d31e85a 100644 --- a/src/plugins/trayicon/trayicon.c +++ b/src/plugins/trayicon/trayicon.c @@ -275,12 +275,12 @@ static void create_trayicon() int plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with"); + *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the Trayicon plugin was built with"); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) { - *error = g_strdup("Your sylpheed version is too old"); + *error = g_strdup("Your version of Sylpheed-Claws is too old for the Trayicon plugin"); return -1; } -- 2.25.1