2005-02-03 [colin] 1.0.0cvs26.1

	* src/common/plugin.c
		Sync with HEAD (avoid plugin mismatches)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 806184170b90707ab7e96b0aa47f9d2456e8f583..24d6c9c76d7832750a29dcb0ec67da312bdbf85a 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-02-03 [colin]     1.0.0cvs26.1
+
+       * src/common/plugin.c
+               Sync with HEAD (avoid plugin mismatches)
+
 2005-02-03 [paul]      1.0.0cvs25.3
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index a75d716e28bad14e401ef0f8131002a25826a239..3d1a313a4e573100c2bf571782372fa39aefd8eb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -356,3 +356,4 @@
 ( cvs diff -u -r 1.94.2.41 -r 1.94.2.42 src/messageview.c; ) > 1.0.0cvs25.1.patchset
 ( cvs diff -u -r 1.18.2.6 -r 1.18.2.7 src/jpilot.c; ) > 1.0.0cvs25.2.patchset
 ( cvs diff -u -r 1.207.2.28 -r 1.207.2.29 src/folderview.c; cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/headerview.c; cvs diff -u -r 1.395.2.50 -r 1.395.2.51 src/summaryview.c; cvs diff -u -r 1.96.2.41 -r 1.96.2.42 src/textview.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/gtk/colorlabel.c; ) > 1.0.0cvs25.3.patchset
+( cvs diff -u -r 1.13.2.1 -r 1.13.2.2 src/common/plugin.c; ) > 1.0.0cvs26.1.patchset

diff --git a/configure.ac b/configure.ac
index 268f802d3fc53f4fbc84ad3eaaeb24e47b9476b7..3b52f5d661d244e4f6d434e2d1e784cff69c4a6f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=26
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.3
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/common/plugin.c b/src/common/plugin.c
index 69159c60b85e99a2828f37ee22c9becd3f2d1fb6..94fe105e43011ce21fe110aa2e17d5aaf49df52e 100644 (file)
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -92,7 +92,8 @@ gint plugin_load(const gchar *filename, gchar **error)
 {
        Plugin *plugin;
        gint (*plugin_init) (gchar **error);
-       gpointer plugin_name, plugin_desc, plugin_type;
+       gpointer plugin_name, plugin_desc;
+       const gchar *(*plugin_type)(void);
        gint ok;
 
        g_return_val_if_fail(filename != NULL, -1);
@@ -113,13 +114,20 @@ gint plugin_load(const gchar *filename, gchar **error)
 
        if (!g_module_symbol(plugin->module, "plugin_name", &plugin_name) ||
            !g_module_symbol(plugin->module, "plugin_desc", &plugin_desc) ||
-           !g_module_symbol(plugin->module, "plugin_type", &plugin_type) ||
+           !g_module_symbol(plugin->module, "plugin_type", (gpointer *) &plugin_type) ||
            !g_module_symbol(plugin->module, "plugin_init", (gpointer *) &plugin_init)) {
                *error = g_strdup(g_module_error());
                g_module_close(plugin->module);
                g_free(plugin);
                return -1;
        }
+       
+       if (!strcmp(plugin_type(), "GTK")) {
+               *error = g_strdup(_("This module is for Sylpheed-Claws GTK1."));
+               g_module_close(plugin->module);
+               g_free(plugin);
+               return -1;
+       }
 
        if ((ok = plugin_init(error)) < 0) {
                g_module_close(plugin->module);