0.9.3claws87

* src/plugins/clamav/clamav_plugin.c
* src/plugins/clamav/clamav_plugin_gtk.c
* src/plugins/dillo_viewer/dillo_viewer.c
* src/plugins/image_viewer/plugin.c
* src/plugins/mathml_viewer/mathml_viewer.c
* src/plugins/spamassassin/spamassassin.c
* src/plugins/spamassassin/spamassassin_gtk.c
* src/plugins/trayicon/trayicon.c
        add version check to all plugins

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7547404038cecec73271d333cefbb19e029a2c06..a2e737c005bc9894484e9e96913cca3ccddecf34 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,9 +1,23 @@
+2003-08-01 [christoph] 0.9.3claws87
+
+       * src/plugins/clamav/clamav_plugin.c
+       * src/plugins/clamav/clamav_plugin_gtk.c
+       * src/plugins/dillo_viewer/dillo_viewer.c
+       * src/plugins/image_viewer/plugin.c
+       * src/plugins/mathml_viewer/mathml_viewer.c
+       * src/plugins/spamassassin/spamassassin.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+       * src/plugins/trayicon/trayicon.c
+               add version check to all plugins
+
 2003-08-01 [hoa]       0.9.3claws86
+
        * src/prefs_filtering.c
                fixed a cosmetic bug, during creation of dialog box,
                wrong widgets were shown after creation.
 
 2003-08-01 [luke]      0.9.3claws85
+
        * src/mainwindow.c
                o fixed visibility of icons/mimeview after toggling separate
                  message/folder view (factored out some similar code too).

diff --git a/configure.ac b/configure.ac
index 617f4f1a18d0bdd882dc6aeb9f369502536530f1..2b8d9f40b98e192e727075b72aec8d4c7f854f01 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=86
+EXTRA_VERSION=87
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c
index dab82228123f956a21c98c29fa8fbbb2d4b217aa..278f2cdb989d08476b4f26fc5568b7f7afc71f6f 100644 (file)
--- a/src/plugins/clamav/clamav_plugin.c
+++ b/src/plugins/clamav/clamav_plugin.c
@@ -26,6 +26,8 @@
 #include <glib.h>
 #include <clamav.h>
 
+#include "common/sylpheed.h"
+#include "common/version.h"
 #include "intl.h"
 #include "plugin.h"
 #include "utils.h"
@@ -200,6 +202,16 @@ void clamav_save_config(void)
 
 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");
+               return -1;
+       }
+
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+               *error = g_strdup("Your sylpheed version is too old");
+               return -1;
+       }
+
        hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL);
        if (hook_id == -1) {
                *error = g_strdup("Failed to register mail filtering hook");

diff --git a/src/plugins/clamav/clamav_plugin_gtk.c b/src/plugins/clamav/clamav_plugin_gtk.c
index 91e0a54c0c7bb3279041f1dd4221fc1a8eae625d..fbe8eddfab6f5ec36aaf9064be92afd6b22784a6 100644 (file)
--- a/src/plugins/clamav/clamav_plugin_gtk.c
+++ b/src/plugins/clamav/clamav_plugin_gtk.c
@@ -26,6 +26,8 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
+#include "common/sylpheed.h"
+#include "common/version.h"
 #include "intl.h"
 #include "plugin.h"
 #include "utils.h"
@@ -227,6 +229,16 @@ static struct ClamAvPage clamav_page;
 
 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");
+               return -1;
+       }
+
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+               *error = g_strdup("Your sylpheed version is too old");
+               return -1;
+       }
+
        clamav_page.page.path = _("Filtering/Clam AntiVirus");
        clamav_page.page.create_widget = clamav_create_widget_func;
        clamav_page.page.destroy_widget = clamav_destroy_widget_func;

diff --git a/src/plugins/dillo_viewer/dillo_viewer.c b/src/plugins/dillo_viewer/dillo_viewer.c
index 580e7f858a9ade95f6bf3e63615495bf763a2a6a..89dafde20f2f0f67b2a0922bfb504f86a7ede579 100644 (file)
--- a/src/plugins/dillo_viewer/dillo_viewer.c
+++ b/src/plugins/dillo_viewer/dillo_viewer.c
@@ -27,6 +27,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
+#include "common/sylpheed.h"
+#include "common/version.h"
 #include "intl.h"
 #include "plugin.h"
 #include "utils.h"
@@ -164,6 +166,16 @@ 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");
+               return -1;
+       }
+
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+               *error = g_strdup("Your sylpheed version is too old");
+               return -1;
+       }
+
         dillo_prefs_init();
 
        mimeview_register_viewer_factory(&dillo_viewer_factory);

diff --git a/src/plugins/image_viewer/plugin.c b/src/plugins/image_viewer/plugin.c
index c16aa6ec265c591da8bbc5186f9acb390ce07d40..21b2319887c885f89d05d0f4b303da1db243aad9 100644 (file)
--- a/src/plugins/image_viewer/plugin.c
+++ b/src/plugins/image_viewer/plugin.c
@@ -23,11 +23,23 @@
 
 #include "intl.h"
 
+#include "common/sylpheed.h"
+#include "common/version.h"
 #include "viewer.h"
 #include "viewerprefs.h"
 
 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");
+               return -1;
+       }
+
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+               *error = g_strdup("Your sylpheed version is too old");
+               return -1;
+       }
+
        image_viewer_prefs_init();
        image_viewer_init();
        return 0;       

diff --git a/src/plugins/mathml_viewer/mathml_viewer.c b/src/plugins/mathml_viewer/mathml_viewer.c
index 59a63ff985459000dd2b26491ba3cf67f4475f41..53db1c339be71ef15cc98ef1cbc0eabd60f5273b 100644 (file)
--- a/src/plugins/mathml_viewer/mathml_viewer.c
+++ b/src/plugins/mathml_viewer/mathml_viewer.c
@@ -27,6 +27,8 @@
 #include <gtk/gtk.h>
 #include <gtkmathview/gtkmathview.h>
 
+#include "common/sylpheed.h"
+#include "common/version.h"
 #include "plugin.h"
 #include "utils.h"
 #include "intl.h"
@@ -137,6 +139,16 @@ 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");
+               return -1;
+       }
+
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+               *error = g_strdup("Your sylpheed version is too old");
+               return -1;
+       }
+
        mimeview_register_viewer_factory(&mathml_viewer_factory);
        return 0;       
 }

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 3d5434c3c29dde9818059e5a53237cccd5fe7723..b42af74b84fda1def5c0c004cd769fc7af238364 100644 (file)
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -29,6 +29,8 @@
 #  include <locale.h>
 #endif
 
+#include "common/sylpheed.h"
+#include "common/version.h"
 #include "plugin.h"
 #include "common/utils.h"
 #include "hooks.h"
@@ -188,6 +190,16 @@ void spamassassin_save_config(void)
 
 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");
+               return -1;
+       }
+
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+               *error = g_strdup("Your sylpheed version is too old");
+               return -1;
+       }
+
        hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL);
        if (hook_id == -1) {
                *error = g_strdup("Failed to register mail filtering hook");

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index f91725abf85aff9fae0d2abccc05bbedccf604a0..3dd5d648551f386eb5ad32e2a0403b7176fa417d 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -26,6 +26,8 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
+#include "common/sylpheed.h"
+#include "common/version.h"
 #include "intl.h"
 #include "plugin.h"
 #include "common/utils.h"
@@ -279,6 +281,16 @@ static struct SpamAssassinPage spamassassin_page;
 
 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");
+               return -1;
+       }
+
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+               *error = g_strdup("Your sylpheed version is too old");
+               return -1;
+       }
+
        spamassassin_page.page.path = _("Filtering/SpamAssassin");
        spamassassin_page.page.create_widget = spamassassin_create_widget_func;
        spamassassin_page.page.destroy_widget = spamassassin_destroy_widget_func;

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index d65466f825b767887c8b26c1874025193b12f3be..7f1b18f3eb87ab6e75954b82b1c0c4dbd2791399 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -22,6 +22,8 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
+#include "common/sylpheed.h"
+#include "common/version.h"
 #include "plugin.h"
 #include "utils.h"
 #include "hooks.h"
@@ -178,6 +180,16 @@ 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");
+               return -1;
+       }
+
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+               *error = g_strdup("Your sylpheed version is too old");
+               return -1;
+       }
+
        hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, folder_item_update_hook, NULL);
        if (hook_id == -1) {
                *error = g_strdup("Failed to register folder item update hook");