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;
}
}
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);
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;
}
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++) {