Fix various win32 runtime issues

[grits] / src / gis-plugin.c

diff --git a/src/gis-plugin.c b/src/gis-plugin.c
index b0619f9b3e2fe16db971bccf26d95af54448055f..57ad922427582cdab19e52235148e83eba53f421 100644 (file)
--- 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;
 }
 
 
@@ -122,16 +123,18 @@ GisPlugin *gis_plugins_load(GisPlugins *self, const char *name,
 {
        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());