2005-12-15 [paul] 1.9.100cvs93

	* src/common/plugin.c
	* src/common/plugin.h
	* src/gtk/pluginwindow.c
	* src/plugins/clamav/clamav_plugin.c
	* src/plugins/demo/demo.c
	* src/plugins/dillo_viewer/dillo_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
		add plugin_version()

diff --git a/ChangeLog b/ChangeLog
index 97be02df6c6f449267de48d41e877548f2fffc0e..9b0b308fa8d07f224ee6281bd7a927adebda587a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-12-15 [paul]      1.9.100cvs93
+
+       * src/common/plugin.c
+       * src/common/plugin.h
+       * src/gtk/pluginwindow.c
+       * src/plugins/clamav/clamav_plugin.c
+       * src/plugins/demo/demo.c
+       * src/plugins/dillo_viewer/dillo_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
+               add plugin_version()
+
 2005-12-15 [cleroy]    1.9.100cvs92
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 818cdafa6ecf5e7fe7fb1adacfc23d1c5080b9c9..f96a060fab8adca45a3d2c0ae28687df4fdf8a32 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1076,3 +1076,4 @@
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/ack.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/keyboard.xml;  cvs diff -u -r 1.60.2.20 -r 1.60.2.21 po/es.po;  ) > 1.9.100cvs90.patchset
 ( cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/gtk/filesel.c;  ) > 1.9.100cvs91.patchset
 ( cvs diff -u -r 1.382.2.206 -r 1.382.2.207 src/compose.c;  ) > 1.9.100cvs92.patchset
+( cvs diff -u -r 1.13.2.11 -r 1.13.2.12 src/common/plugin.c;  cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/common/plugin.h;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/gtk/pluginwindow.c;  cvs diff -u -r 1.13.2.18 -r 1.13.2.19 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.13.2.4 -r 1.13.2.5 src/plugins/demo/demo.c;  cvs diff -u -r 1.12.2.9 -r 1.12.2.10 src/plugins/dillo_viewer/dillo_viewer.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpcore/plugin.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpinline/plugin.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpmime/plugin.c;  cvs diff -u -r 1.18.2.15 -r 1.18.2.16 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.14.2.29 -r 1.14.2.30 src/plugins/trayicon/trayicon.c;  ) > 1.9.100cvs93.patchset

diff --git a/configure.ac b/configure.ac
index 912f4cc18d813c8ca8f8e8e0d51ad0d13fa3dee7..4bd8dc5e037c73f9d54f06dc3436da2a6e5558a3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=92
+EXTRA_VERSION=93
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/plugin.c b/src/common/plugin.c
index fe46b5707015fe42c181258119a90175c269f1cf..1e9689cd766ff568556180d3c295cbe39bece487 100644 (file)
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -34,6 +34,7 @@ struct _Plugin
        GModule *module;
        const gchar *(*name) (void);
        const gchar *(*desc) (void);
+       const gchar *(*version) (void);
        const gchar *(*type) (void);
        const gchar *(*licence) (void);
        GSList *rdeps;
@@ -192,7 +193,7 @@ Plugin *plugin_load(const gchar *filename, gchar **error)
 {
        Plugin *plugin;
        gint (*plugin_init) (gchar **error);
-       gpointer plugin_name, plugin_desc;
+       gpointer plugin_name, plugin_desc, plugin_version;
        const gchar *(*plugin_type)(void);
        const gchar *(*plugin_licence)(void);
        gint ok;
@@ -223,6 +224,7 @@ Plugin *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_version", &plugin_version) ||
            !g_module_symbol(plugin->module, "plugin_type", (gpointer)&plugin_type) ||
            !g_module_symbol(plugin->module, "plugin_licence", (gpointer)&plugin_licence) ||
            !g_module_symbol(plugin->module, "plugin_init", (gpointer)&plugin_init)) {
@@ -255,6 +257,7 @@ Plugin *plugin_load(const gchar *filename, gchar **error)
 
        plugin->name = plugin_name;
        plugin->desc = plugin_desc;
+       plugin->version = plugin_version;
        plugin->type = plugin_type;
        plugin->licence = plugin_licence;
        plugin->filename = g_strdup(filename);
@@ -351,3 +354,8 @@ const gchar *plugin_get_desc(Plugin *plugin)
 {
        return plugin->desc();
 }
+
+const gchar *plugin_get_version(Plugin *plugin)
+{
+       return plugin->version();
+}

diff --git a/src/common/plugin.h b/src/common/plugin.h
index 2b0d7276241ec3aea7da142f82417087bc983d57..22af0c690dfd8fa50f5f511e34b199e1666787bf 100644 (file)
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -29,6 +29,7 @@ gint plugin_init              (gchar          **error);
 void plugin_done               (void);
 const gchar *plugin_name       (void);
 const gchar *plugin_desc       (void);
+const gchar *plugin_version    (void);
 
 /* Functions by the sylpheed plugin system */
 Plugin *plugin_load            (const gchar     *filename,
@@ -41,5 +42,6 @@ void plugin_save_list         (void);
 GSList *plugin_get_list                (void);
 const gchar *plugin_get_name   (Plugin          *plugin);
 const gchar *plugin_get_desc   (Plugin          *plugin);
+const gchar *plugin_get_version        (Plugin          *plugin);
 
 #endif

diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index 08d63dd8448b57916cf16e63712a94ec230df21f..def3ebafc8d5b319e45a05e6a9be05657c0feeee 100644 (file)
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -126,7 +126,8 @@ static void select_row_cb(Plugin *plugin, PluginWindow *pluginwindow)
                gtk_text_buffer_get_start_iter(textbuf, &start_iter);
                gtk_text_buffer_get_end_iter(textbuf, &end_iter);
                gtk_text_buffer_delete(textbuf, &start_iter, &end_iter);
-               text = plugin_get_desc(plugin);
+               text = g_strconcat(plugin_get_desc(plugin), _("\n\nVersion: "),
+                                  plugin_get_version(plugin), "\n", NULL);
                gtk_text_buffer_insert(textbuf, &start_iter, text, strlen(text));
                gtk_widget_set_sensitive(pluginwindow->unload_btn, TRUE);
        } else {

diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c
index 72cc1966f185b46fdd0827ecbb43910aa01a59b2..1f70369cddef2260c1cda1448e51d599a015ce2a 100644 (file)
--- a/src/plugins/clamav/clamav_plugin.c
+++ b/src/plugins/clamav/clamav_plugin.c
@@ -269,3 +269,7 @@ const gchar *plugin_licence(void)
        return "GPL";
 }
 
+const gchar *plugin_version(void)
+{
+       return VERSION;
+}

diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c
index 07ba2e8dcd719a2f764ca1c54debe4e4f512f4e0..871ed6a633405526efad42fcde02e887a278b568 100644 (file)
--- a/src/plugins/demo/demo.c
+++ b/src/plugins/demo/demo.c
@@ -89,6 +89,10 @@ const gchar *plugin_type(void)
 
 const gchar *plugin_licence(void)
 {
-return "GPL";
+       return "GPL";
 }
 
+const gchar *plugin_version(void)
+{
+       return VERSION;
+}

diff --git a/src/plugins/dillo_viewer/dillo_viewer.c b/src/plugins/dillo_viewer/dillo_viewer.c
index cbe24b066d7055e07dbd2cc839aed79f96993c97..a5c5b749c047c425ec8879bbcbaaf5cf4de269a8 100644 (file)
--- a/src/plugins/dillo_viewer/dillo_viewer.c
+++ b/src/plugins/dillo_viewer/dillo_viewer.c
@@ -209,3 +209,7 @@ const gchar *plugin_licence(void)
        return "GPL";
 }
 
+const gchar *plugin_version(void)
+{
+       return VERSION;
+}

diff --git a/src/plugins/pgpcore/plugin.c b/src/plugins/pgpcore/plugin.c
index 0421656172589592eddd154241fb0c3812ff2750..4de9d74d19e11236912e118e5241002d0e77fcf3 100644 (file)
--- a/src/plugins/pgpcore/plugin.c
+++ b/src/plugins/pgpcore/plugin.c
@@ -76,3 +76,8 @@ const gchar *plugin_licence(void)
        return "GPL";
 }
 
+const gchar *plugin_version(void)
+{
+       return VERSION;
+}
+

diff --git a/src/plugins/pgpinline/plugin.c b/src/plugins/pgpinline/plugin.c
index 5d6d3769a006c611581cd287429bbf147cd1ab89..99394e9f04fb1937a5f9df8899d63aac990887a1 100644 (file)
--- a/src/plugins/pgpinline/plugin.c
+++ b/src/plugins/pgpinline/plugin.c
@@ -77,3 +77,7 @@ const gchar *plugin_licence(void)
        return "GPL";
 }
 
+const gchar *plugin_version(void)
+{
+       return VERSION;
+}

diff --git a/src/plugins/pgpmime/plugin.c b/src/plugins/pgpmime/plugin.c
index 7641b43d41bbb3114d324aace0511390c1274cea..890050dbc12021272dad9cf909635874a51f0c30 100644 (file)
--- a/src/plugins/pgpmime/plugin.c
+++ b/src/plugins/pgpmime/plugin.c
@@ -77,3 +77,7 @@ const gchar *plugin_licence(void)
        return "GPL";
 }
 
+const gchar *plugin_version(void)
+{
+       return VERSION;
+}

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 40cbfed7e88618cebb981ce3a10af9ede52bccb2..bf1dbbc94dd5c57cd00eb0dd29b4809e88ca1239 100644 (file)
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -352,3 +352,8 @@ const gchar *plugin_licence(void)
        return "GPL";
 }
 
+const gchar *plugin_version(void)
+{
+       return VERSION;
+}
+

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 08ffbe4aef24b56a9f81cd162a475fb58851a629..a68d2559fe8e3382a2e12d62ac222f8696038bc1 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -330,6 +330,11 @@ const gchar *plugin_licence(void)
        return "GPL";
 }
 
+const gchar *plugin_version(void)
+{
+       return VERSION;
+}
+
 
 /* popup menu callbacks */
 static void trayicon_get_all_cb( gpointer data, guint action, GtkWidget *widget )