CVS: sylpheedclaws/sylpheed-claws/src/plugins/trayicon trayicon.c,1.14.2.45,1.14.2.46

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/plugins/trayicon
In directory sunsite.dk:/tmp/cvs-serv8976/src/plugins/trayicon

Modified Files:
      Tag: gtk2
	trayicon.c 
Log Message:
2006-12-15 [wwp]	2.6.1cvs40

	* src/wizard.c
	* src/common/plugin.c
	* src/common/plugin.h
	* src/gtk/about.c
	* src/plugins/bogofilter/bogofilter.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
		factorize some translatable strings (plugins-related),
		fix missing punctuation in several places,
		remove useless translatable \n in about.c,
		and factorize plugin init code w/ a new function
		check_plugin_version() in common/plugin.c.
		Patch by Fabien Vantard <[email protected]>. 

Index: trayicon.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/plugins/trayicon/trayicon.c,v
retrieving revision 1.14.2.45
retrieving revision 1.14.2.46
diff -u -d -r1.14.2.45 -r1.14.2.46
--- trayicon.c	2006/11/27 08:07:23	1.14.2.45
+++ trayicon.c	2006/12/15 16:41:15	1.14.2.46
@@ -56,6 +56,8 @@
 #include "unreadmail.offline.xpm"
 #include "nomail.offline.xpm"
 
+#define PLUGIN_NAME (_("Trayicon"))
+
 static guint item_hook_id;
 static guint folder_hook_id;
 static guint offline_hook_id;
@@ -350,15 +352,9 @@
 
 int plugin_init(gchar **error)
 {
-	if ((claws_get_version() > VERSION_NUMERIC)) {
-		*error = g_strdup(_("Your version of Claws Mail is newer than the version the Trayicon plugin was built with"));
-		return -1;
-	}
-
-	if ((claws_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
-		*error = g_strdup(_("Your version of Claws Mail is too old for the Trayicon plugin"));
+	if (!check_plugin_version(MAKE_NUMERIC_VERSION(0, 9, 3, 86),
+				VERSION_NUMERIC, PLUGIN_NAME, error))
 		return -1;
-	}
 
 	item_hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, folder_item_update_hook, NULL);
 	if (item_hook_id == -1) {
@@ -411,7 +407,7 @@
 
 const gchar *plugin_name(void)
 {
-	return _("Trayicon");
+	return PLUGIN_NAME;
 }
 
 const gchar *plugin_desc(void)