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

diff --git a/src/gis-plugin.c b/src/gis-plugin.c
index 2e0ef1b..6f0834a 100644
--- a/src/gis-plugin.c
+++ b/src/gis-plugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,17 +47,26 @@ GType gis_plugin_get_type()
 	return type;
 }
 
-void gis_plugin_expose(GisPlugin *self)
+const gchar *gis_plugin_get_name(GisPlugin *plugin)
 {
-	g_return_if_fail(GIS_IS_PLUGIN(self));
-	GIS_PLUGIN_GET_INTERFACE(self)->expose(self);
+	if (!GIS_IS_PLUGIN(plugin))
+		return NULL;
+	return GIS_PLUGIN_GET_INTERFACE(plugin)->name;
+}
+
+const gchar *gis_plugin_get_description(GisPlugin *plugin)
+{
+	if (!GIS_IS_PLUGIN(plugin))
+		return NULL;
+	return GIS_PLUGIN_GET_INTERFACE(plugin)->description;
 }
 
-GtkWidget *gis_plugin_get_config(GisPlugin *self)
+GtkWidget *gis_plugin_get_config(GisPlugin *plugin)
 {
-	g_return_val_if_fail(GIS_IS_PLUGIN(self), NULL);
-	GisPluginInterface *iface = GIS_PLUGIN_GET_INTERFACE(self);
-	return iface->get_config ? iface->get_config (self) : NULL;
+	if (!GIS_IS_PLUGIN(plugin))
+		return NULL;
+	GisPluginInterface *iface = GIS_PLUGIN_GET_INTERFACE(plugin);
+	return iface->get_config ? iface->get_config(plugin) : NULL;
 }
 
 
@@ -69,39 +78,43 @@ typedef struct {
 	GisPlugin *plugin;
 } GisPluginStore;
 
-GisPlugins *gis_plugins_new(gchar *dir)
+GisPlugins *gis_plugins_new(const gchar *dir, GisPrefs *prefs)
 {
 	g_debug("GisPlugins: new - dir=%s", dir);
 	GisPlugins *plugins = g_new0(GisPlugins, 1);
+	plugins->prefs = prefs;
 	if (dir)
 		plugins->dir = g_strdup(dir);
-	plugins->plugins = g_ptr_array_new();
 	return plugins;
 }
 
-void gis_plugins_free(GisPlugins *self)
+void gis_plugins_free(GisPlugins *plugins)
 {
 	g_debug("GisPlugins: free");
-	for (int i = 0; i < self->plugins->len; i++) {
-		GisPluginStore *store = g_ptr_array_index(self->plugins, i);
+	for (GList *cur = plugins->plugins; cur; cur = cur->next) {
+		GisPluginStore *store = cur->data;
+		g_debug("GisPlugin: freeing %s refs=%d->%d", store->name,
+			G_OBJECT(store->plugin)->ref_count,
+			G_OBJECT(store->plugin)->ref_count-1);
 		g_object_unref(store->plugin);
 		g_free(store->name);
 		g_free(store);
-		g_ptr_array_remove_index(self->plugins, i);
 	}
-	g_ptr_array_free(self->plugins, TRUE);
-	if (self->dir)
-		g_free(self->dir);
-	g_free(self);
+	g_list_free(plugins->plugins);
+	if (plugins->dir)
+		g_free(plugins->dir);
+	g_free(plugins);
 }
 
-GList *gis_plugins_available(GisPlugins *self)
+GList *gis_plugins_available(GisPlugins *plugins)
 {
 	g_debug("GisPlugins: available");
 	GList *list = NULL;
-	gchar *dirs[] = {self->dir, PLUGINSDIR};
+	gchar *dirs[] = {plugins->dir, PLUGINSDIR};
 	g_debug("pluginsdir=%s", PLUGINSDIR);
 	for (int i = 0; i<2; i++) {
+		if (dirs[i] == NULL)
+			continue;
 		GDir *dir = g_dir_open(dirs[i], 0, NULL);
 		if (dir == NULL)
 			continue;
@@ -114,15 +127,16 @@ GList *gis_plugins_available(GisPlugins *self)
 				g_strfreev(parts);
 			}
 		}
+		g_dir_close(dir);
 	}
 	return list;
 }
 
-GisPlugin *gis_plugins_load(GisPlugins *self, const char *name,
+GisPlugin *gis_plugins_load(GisPlugins *plugins, const char *name,
 		GisViewer *viewer, GisPrefs *prefs)
 {
 	g_debug("GisPlugins: load %s", name);
-	gchar *path = g_strdup_printf("%s/%s.%s", self->dir, name, G_MODULE_SUFFIX);
+	gchar *path = g_strdup_printf("%s/%s.%s", plugins->dir, name, G_MODULE_SUFFIX);
 	g_debug("GisPlugins: load - trying %s", path);
 	if (!g_file_test(path, G_FILE_TEST_EXISTS)) {
 		g_free(path);
@@ -156,33 +170,63 @@ GisPlugin *gis_plugins_load(GisPlugins *self, const char *name,
 	GisPluginStore *store = g_new0(GisPluginStore, 1);
 	store->name = g_strdup(name);
 	store->plugin = constructor(viewer, prefs);
-	g_ptr_array_add(self->plugins, store);
+	plugins->plugins = g_list_prepend(plugins->plugins, store);
 	return store->plugin;
 }
 
-gboolean gis_plugins_unload(GisPlugins *self, const char *name)
+GisPlugin *gis_plugins_enable(GisPlugins *plugins, const char *name,
+		GisViewer *viewer, GisPrefs *prefs)
+{
+	GisPlugin *plugin = gis_plugins_load(plugins, name, viewer, prefs);
+	gis_prefs_set_boolean_v(plugins->prefs, "plugins", name, TRUE);
+	return plugin;
+}
+
+GList *gis_plugins_load_enabled(GisPlugins *plugins,
+		GisViewer *viewer, GisPrefs *prefs)
+{
+	GList *loaded = NULL;
+	for (GList *cur = gis_plugins_available(plugins); cur; cur = cur->next) {
+		gchar *name = cur->data;
+		if (gis_prefs_get_boolean_v(plugins->prefs, "plugins", name, NULL)) {
+			GisPlugin *plugin = gis_plugins_load(plugins, name, viewer, prefs);
+			loaded = g_list_prepend(loaded, plugin);
+		}
+	}
+	return loaded;
+}
+
+gboolean gis_plugins_unload(GisPlugins *plugins, const char *name)
 {
 	g_debug("GisPlugins: unload %s", name);
-	for (int i = 0; i < self->plugins->len; i++) {
-		GisPluginStore *store = g_ptr_array_index(self->plugins, i);
+	for (GList *cur = plugins->plugins; cur; cur = cur->next) {
+		GisPluginStore *store = cur->data;
 		if (g_str_equal(store->name, name)) {
 			g_object_unref(store->plugin);
 			g_free(store->name);
 			g_free(store);
-			g_ptr_array_remove_index(self->plugins, i);
+			plugins->plugins = g_list_delete_link(plugins->plugins, cur);
 		}
 	}
 	return FALSE;
 }
-void gis_plugins_foreach(GisPlugins *self, GCallback _callback, gpointer user_data)
+
+gboolean gis_plugins_disable(GisPlugins *plugins, const char *name)
+{
+	gis_prefs_set_boolean_v(plugins->prefs, "plugins", name, FALSE);
+	gis_plugins_unload(plugins, name);
+	return FALSE;
+}
+
+void gis_plugins_foreach(GisPlugins *plugins, GCallback _callback, gpointer user_data)
 {
 	g_debug("GisPlugins: foreach");
-	if (self == NULL)
+	if (plugins == NULL)
 		return;
 	typedef void (*CBFunc)(GisPlugin *, const gchar *, gpointer);
 	CBFunc callback = (CBFunc)_callback;
-	for (int i = 0; i < self->plugins->len; i++) {
-		GisPluginStore *store = g_ptr_array_index(self->plugins, i);
+	for (GList *cur = plugins->plugins; cur; cur = cur->next) {
+		GisPluginStore *store = cur->data;
 		callback(store->plugin, store->name, user_data);
 	}
 }