From: Colin Leroy <colin@colino.net>
Date: Fri, 9 Dec 2005 07:43:06 +0000 (+0000)
Subject: 2005-12-09 [cleroy]	1.9.100cvs78
X-Git-Tag: rel_2_0_0~138
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=e2f0764b32f889c9a908c433a7ec91a788d23c4c;ds=sidebyside

2005-12-09 [cleroy]	1.9.100cvs78

	* src/common/plugin.c
		Update licence check, following Eben Moglen's advice
---

diff --git a/ChangeLog b/ChangeLog
index 96b946f82..c8eec4ef2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-09 [cleroy]	1.9.100cvs78
+
+	* src/common/plugin.c
+		Update licence check, following Eben Moglen's advice
+
 2005-12-08 [colin]	1.9.100cvs77
 
 	* src/folder.c
diff --git a/PATCHSETS b/PATCHSETS
index 3f261251b..168767207 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1061,3 +1061,4 @@
 ( cvs diff -u -r 1.204.2.70 -r 1.204.2.71 src/prefs_common.c;  cvs diff -u -r 1.103.2.37 -r 1.103.2.38 src/prefs_common.h;  cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/gtk/filesel.c;  ) > 1.9.100cvs75.patchset
 ( cvs diff -u -r 1.83.2.52 -r 1.83.2.53 src/mimeview.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/sgpgme.c;  ) > 1.9.100cvs76.patchset
 ( cvs diff -u -r 1.213.2.69 -r 1.213.2.70 src/folder.c;  ) > 1.9.100cvs77.patchset
+( cvs diff -u -r 1.13.2.9 -r 1.13.2.10 src/common/plugin.c;  ) > 1.9.100cvs78.patchset
diff --git a/configure.ac b/configure.ac
index a7d8da2ba..7f8a4bb33 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=77
+EXTRA_VERSION=78
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 478c3dc70..34d4115bb 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -231,8 +231,9 @@ Plugin *plugin_load(const gchar *filename, gchar **error)
 		return NULL;
 	}
 	
-	if (strcmp(plugin_licence(), "GPL")) {
-		*error = g_strdup(_("This module is not licenced under the GPL."));
+	if (strcmp(plugin_licence(), "GPL")
+	&&  strncmp(plugin_licence(), "GPL-compatible", strlen("GPL-compatible"))) {
+		*error = g_strdup(_("This module is not licenced under a GPL compatible licence."));
 		g_module_close(plugin->module);
 		g_free(plugin);
 		return NULL;