From: Paul Mangan Date: Thu, 15 Dec 2005 08:58:20 +0000 (+0000) Subject: 2005-12-15 [paul] 1.9.100cvs93 X-Git-Tag: rel_2_0_0~121 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=3d40ddbdeb0fe5ec2c03c02cb58f422b36ba1817 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 97be02df6..9b0b308fa 100644 --- 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 818cdafa6..f96a060fa 100644 --- 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 912f4cc18..4bd8dc5e0 100644 --- 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 fe46b5707..1e9689cd7 100644 --- 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 2b0d72762..22af0c690 100644 --- 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 08d63dd84..def3ebafc 100644 --- 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 72cc1966f..1f70369cd 100644 --- 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 07ba2e8dc..871ed6a63 100644 --- 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 cbe24b066..a5c5b749c 100644 --- 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 042165617..4de9d74d1 100644 --- 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 5d6d3769a..99394e9f0 100644 --- 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 7641b43d4..890050dbc 100644 --- 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 40cbfed7e..bf1dbbc94 100644 --- 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 08ffbe4ae..a68d2559f 100644 --- 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 )