CVS: sylpheedclaws/sylpheed-claws/src/plugins/dillo_viewer dillo_viewer.c,1.12.2.17,1.12.2.18
[email protected] Fri, 15 Dec 2006 16:41:08 +0000
| Newsgroups | gmane.mail.sylpheed.claws.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/plugins/dillo_viewer
In directory sunsite.dk:/tmp/cvs-serv8976/src/plugins/dillo_viewer
Modified Files:
Tag: gtk2
dillo_viewer.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: dillo_viewer.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/plugins/dillo_viewer/dillo_viewer.c,v
retrieving revision 1.12.2.17
retrieving revision 1.12.2.18
diff -u -d -r1.12.2.17 -r1.12.2.18
--- dillo_viewer.c 2006/11/27 08:07:06 1.12.2.17
+++ dillo_viewer.c 2006/12/15 16:41:04 1.12.2.18
@@ -36,6 +36,8 @@
#include "dillo_prefs.h"
+#define PLUGIN_NAME (_("Dillo HTML Viewer"))
+
typedef struct _DilloViewer DilloViewer;
struct _DilloViewer
@@ -165,15 +167,9 @@
gint plugin_init(gchar **error)
{
- if ((claws_get_version() > VERSION_NUMERIC)) {
- *error = g_strdup(_("Your version of Claws Mail is newer than the version the Dillo 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 Dillo plugin"));
- return -1;
- }
+ if (!check_plugin_version(MAKE_NUMERIC_VERSION(0, 9, 3, 86),
+ VERSION_NUMERIC, PLUGIN_NAME, error))
+ return -1;
dillo_prefs_init();
@@ -191,7 +187,7 @@
const gchar *plugin_name(void)
{
- return _("Dillo HTML Viewer");
+ return PLUGIN_NAME;
}
const gchar *plugin_desc(void)