X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-plugin.c;h=8c3ba3674a39847ff10f6eb0b886e8ffbe45e68b;hb=1ccb2426332856ef04f0bfb35716520a94e0d32c;hp=f87b09a6ba50d860558fecb126af919ca8e35118;hpb=a2a902d978b6050289f7a92794fb1dc0aa2b5e26;p=grits

diff --git a/src/gis-plugin.c b/src/gis-plugin.c
index f87b09a..8c3ba36 100644
--- a/src/gis-plugin.c
+++ b/src/gis-plugin.c
@@ -49,13 +49,18 @@ GType gis_plugin_get_type()
 
 void gis_plugin_expose(GisPlugin *self)
 {
-	g_return_if_fail(GIS_IS_PLUGIN(self));
+	if (!GIS_IS_PLUGIN(self))
+		return;
+	GisPluginInterface *iface = GIS_PLUGIN_GET_INTERFACE(self);
+	if (iface->expose)
+		return
 	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;
 }
@@ -119,7 +124,7 @@ GList *gis_plugins_available(GisPlugins *self)
 }
 
 GisPlugin *gis_plugins_load(GisPlugins *self, const char *name,
-		GisViewer *viewer, 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);
@@ -155,7 +160,7 @@ GisPlugin *gis_plugins_load(GisPlugins *self, const char *name,
 
 	GisPluginStore *store = g_new0(GisPluginStore, 1);
 	store->name = g_strdup(name);
-	store->plugin = constructor(viewer, opengl, prefs);
+	store->plugin = constructor(viewer, prefs);
 	g_ptr_array_add(self->plugins, store);
 	return store->plugin;
 }
@@ -177,6 +182,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++) {