X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-plugin.c;h=2e0ef1bdf8b0a802fd4b226f4b1e2a58eeb916f7;hb=c9865c176b97e2082a998b439ec51c31832e55f6;hp=2ba5ca69a61aef70a6591412d9a1c07f3a336f0f;hpb=ac7156bd84aef88b712f117f7e2f3d847d371719;p=grits

diff --git a/src/gis-plugin.c b/src/gis-plugin.c
index 2ba5ca6..2e0ef1b 100644
--- a/src/gis-plugin.c
+++ b/src/gis-plugin.c
@@ -56,7 +56,8 @@ void gis_plugin_expose(GisPlugin *self)
 GtkWidget *gis_plugin_get_config(GisPlugin *self)
 {
 	g_return_val_if_fail(GIS_IS_PLUGIN(self), NULL);
-	return GIS_PLUGIN_GET_INTERFACE(self)->get_config(self);
+	GisPluginInterface *iface = GIS_PLUGIN_GET_INTERFACE(self);
+	return iface->get_config ? iface->get_config (self) : NULL;
 }
 
 
@@ -107,7 +108,7 @@ GList *gis_plugins_available(GisPlugins *self)
 		g_debug("            checking %s", dirs[i]);
 		const gchar *name;
 		while ((name = g_dir_read_name(dir))) {
-			if (g_pattern_match_simple("*.so", name)) {
+			if (g_pattern_match_simple("*." G_MODULE_SUFFIX, name)) {
 				gchar **parts = g_strsplit(name, ".", 2);
 				list = g_list_prepend(list, g_strdup(parts[0]));
 				g_strfreev(parts);
@@ -118,17 +119,22 @@ GList *gis_plugins_available(GisPlugins *self)
 }
 
 GisPlugin *gis_plugins_load(GisPlugins *self, const char *name,
-		GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs)
+		GisViewer *viewer, GisPrefs *prefs)
 {
 	g_debug("GisPlugins: load %s", name);
 	gchar *path = g_strdup_printf("%s/%s.%s", self->dir, name, G_MODULE_SUFFIX);
-	if (!g_file_test(path, G_FILE_TEST_EXISTS))
+	g_debug("GisPlugins: load - trying %s", path);
+	if (!g_file_test(path, G_FILE_TEST_EXISTS)) {
+		g_free(path);
 		path = g_strdup_printf("%s/%s.%s", PLUGINSDIR, name, G_MODULE_SUFFIX);
+	}
+	g_debug("GisPlugins: load - trying %s", path);
 	if (!g_file_test(path, G_FILE_TEST_EXISTS)) {
 		g_warning("Module %s not found", name);
+		g_free(path);
 		return NULL;
 	}
-	GModule *module = g_module_open(path, 0);
+	GModule *module = g_module_open(path, G_MODULE_BIND_LAZY);
 	g_free(path);
 	if (module == NULL) {
 		g_warning("Unable to load module %s: %s", name, g_module_error());
@@ -147,9 +153,9 @@ GisPlugin *gis_plugins_load(GisPlugins *self, const char *name,
 	g_free(constructor_str);
 	GisPluginConstructor constructor = constructor_ptr;
 
-	GisPluginStore *store = g_malloc(sizeof(GisPluginStore));
+	GisPluginStore *store = g_new0(GisPluginStore, 1);
 	store->name = g_strdup(name);
-	store->plugin = constructor(world, view, opengl, prefs);
+	store->plugin = constructor(viewer, prefs);
 	g_ptr_array_add(self->plugins, store);
 	return store->plugin;
 }
@@ -171,6 +177,8 @@ gboolean gis_plugins_unload(GisPlugins *self, const char *name)
 void gis_plugins_foreach(GisPlugins *self, GCallback _callback, gpointer user_data)
 {
 	g_debug("GisPlugins: foreach");
+	if (self == NULL)
+		return;
 	typedef void (*CBFunc)(GisPlugin *, const gchar *, gpointer);
 	CBFunc callback = (CBFunc)_callback;
 	for (int i = 0; i < self->plugins->len; i++) {