Misc OpenGL refactoring and minor updates

[grits] / src / gis-plugin.c

diff --git a/src/gis-plugin.c b/src/gis-plugin.c
index eb162b7c861df7a6ff6eebff77d1914bdba1712f..66c3d1fcd1e47ccbfb92c406d95ded1cbd074233 100644 (file)
--- a/src/gis-plugin.c
+++ b/src/gis-plugin.c
@@ -47,15 +47,10 @@ GType gis_plugin_get_type()
        return type;
 }
 
-void gis_plugin_expose(GisPlugin *self)
-{
-       g_return_if_fail(GIS_IS_PLUGIN(self));
-       GIS_PLUGIN_GET_INTERFACE(self)->expose(self);
-}
-
 GtkWidget *gis_plugin_get_config(GisPlugin *self)
 {
-       g_return_val_if_fail(GIS_IS_PLUGIN(self), NULL);
+       if (!GIS_IS_PLUGIN(self))
+               return NULL;
        GisPluginInterface *iface = GIS_PLUGIN_GET_INTERFACE(self);
        return iface->get_config ? iface->get_config (self) : NULL;
 }
@@ -108,7 +103,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);
@@ -119,20 +114,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);
+       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());
@@ -153,7 +150,7 @@ GisPlugin *gis_plugins_load(GisPlugins *self, const char *name,
 
        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;
 }
@@ -175,6 +172,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++) {