From e815cc177c7e70046920d56d079a3d672c2e3fe2 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Thu, 18 Dec 2014 16:25:49 +0100
Subject: [PATCH] Implemented Confi::remove in plugins.

---
 plugins/db/plgdb.c     | 33 +++++++++++++++++++++++++++++++++
 plugins/file/plgfile.c | 21 +++++++++++++++++++++
 src/confipluggable.c   | 21 ++++++++++++++++++++-
 src/confipluggable.h   |  3 ++-
 src/libconfi.c         | 30 ++++++++++--------------------
 5 files changed, 86 insertions(+), 22 deletions(-)

diff --git a/plugins/db/plgdb.c b/plugins/db/plgdb.c
index 4c1c96f..fcf953a 100644
--- a/plugins/db/plgdb.c
+++ b/plugins/db/plgdb.c
@@ -812,6 +812,38 @@ confi_db_plugin_remove_path (ConfiPluggable *pluggable, const gchar *path)
 	return ret;
 }
 
+static gboolean
+confi_db_plugin_remove (ConfiPluggable *pluggable)
+{
+	gboolean ret;
+	gchar *sql;
+
+	ConfiDBPluginPrivate *priv = CONFI_DB_PLUGIN_GET_PRIVATE (pluggable);
+
+	ret = TRUE;
+	sql = g_strdup_printf ("DELETE FROM %cvalues%c WHERE id_configs = %d",
+                           priv->chrquot,
+                           priv->chrquot,
+                           priv->id_config);
+	if (gdaex_execute (priv->gdaex, sql) == -1)
+		{
+			g_free (sql);
+			ret = FALSE;
+		}
+	else
+		{
+			g_free (sql);
+			sql = g_strdup_printf ("DELETE FROM configs WHERE id = %d",
+			                       priv->id_config);
+			if (gdaex_execute (priv->gdaex, sql) == -1)
+				{
+					ret = FALSE;
+				}
+			g_free (sql);
+		}
+
+	return ret;
+}
 
 static void
 confi_db_plugin_class_init (ConfiDBPluginClass *klass)
@@ -841,6 +873,7 @@ confi_pluggable_iface_init (ConfiPluggableInterface *iface)
 	iface->add_key = confi_db_plugin_add_key;
 	iface->path_get_confi_key = confi_db_plugin_path_get_confi_key;
 	iface->remove_path = confi_db_plugin_remove_path;
+	iface->remove = confi_db_plugin_remove;
 }
 
 static void
diff --git a/plugins/file/plgfile.c b/plugins/file/plgfile.c
index 581745e..4f35a80 100644
--- a/plugins/file/plgfile.c
+++ b/plugins/file/plgfile.c
@@ -540,6 +540,26 @@ confi_file_plugin_remove_path (ConfiPluggable *pluggable, const gchar *path)
 	return ret;
 }
 
+static gboolean
+confi_file_plugin_remove (ConfiPluggable *pluggable)
+{
+	gboolean ret;
+	GFile *gfile;
+
+	ConfiFilePluginPrivate *priv = CONFI_FILE_PLUGIN_GET_PRIVATE (pluggable);
+
+	ret = TRUE;
+
+	gfile = g_file_new_for_path (priv->cnc_string);
+	if (gfile != NULL)
+		{
+			g_file_delete (gfile, NULL, NULL);
+		}
+	g_key_file_unref (priv->kfile);
+
+	return ret;
+}
+
 static void
 confi_file_plugin_class_init (ConfiFilePluginClass *klass)
 {
@@ -568,6 +588,7 @@ confi_pluggable_iface_init (ConfiPluggableInterface *iface)
 	iface->add_key = confi_file_plugin_add_key;
 	iface->path_get_confi_key = confi_file_plugin_path_get_confi_key;
 	iface->remove_path = confi_file_plugin_remove_path;
+	iface->remove = confi_file_plugin_remove;
 }
 
 static void
diff --git a/src/confipluggable.c b/src/confipluggable.c
index e655a21..78ebeb8 100644
--- a/src/confipluggable.c
+++ b/src/confipluggable.c
@@ -235,7 +235,7 @@ ConfiKey
 
 /**
  * confi_pluggable_remove_path:
- * @confi: a #Confi object.
+ * @pluggable: a #ConfiPluggable object.
  * @path: the path to remove.
  *
  * Removes @path and every child key.
@@ -252,3 +252,22 @@ confi_pluggable_remove_path (ConfiPluggable *pluggable, const gchar *path)
 
 	return iface->remove_path (pluggable, path);
 }
+
+/**
+ * confi_pluggable_remove:
+ * @pluggable: a #ConfiPluggable object.
+ *
+ * Remove a configuration from databases and destroy the relative object.
+ */
+gboolean
+confi_pluggable_remove (ConfiPluggable *pluggable)
+{
+	ConfiPluggableInterface *iface;
+
+	g_return_val_if_fail (CONFI_IS_PLUGGABLE (pluggable), FALSE);
+
+	iface = CONFI_PLUGGABLE_GET_IFACE (pluggable);
+	g_return_val_if_fail (iface->remove != NULL, FALSE);
+
+	return iface->remove (pluggable);
+}
diff --git a/src/confipluggable.h b/src/confipluggable.h
index 1b0b9e5..65a1571 100644
--- a/src/confipluggable.h
+++ b/src/confipluggable.h
@@ -67,7 +67,7 @@ struct _ConfiPluggableInterface {
 	ConfiKey *(*add_key) (ConfiPluggable *pluggable, const gchar *parent, const gchar *key, const gchar *value);
 	ConfiKey *(*path_get_confi_key) (ConfiPluggable *pluggable, const gchar *path);
 	gboolean (*remove_path) (ConfiPluggable *pluggable, const gchar *path);
-
+	gboolean (*remove) (ConfiPluggable *pluggable);
 };
 
 /*
@@ -92,6 +92,7 @@ ConfiKey *confi_pluggable_add_key (ConfiPluggable *pluggable,
                                    const gchar *value);
 ConfiKey *confi_pluggable_path_get_confi_key (ConfiPluggable *pluggable, const gchar *path);
 gboolean confi_pluggable_remove_path (ConfiPluggable *pluggable, const gchar *path);
+gboolean confi_pluggable_remove (ConfiPluggable *pluggable);
 
 
 G_END_DECLS
diff --git a/src/libconfi.c b/src/libconfi.c
index ca4118b..e813a62 100644
--- a/src/libconfi.c
+++ b/src/libconfi.c
@@ -490,33 +490,22 @@ gboolean
 confi_remove (Confi *confi)
 {
 	gboolean ret;
-	gchar *sql;
 
 	ConfiPrivate *priv = CONFI_GET_PRIVATE (confi);
 
-	ret = TRUE;
-	sql = g_strdup_printf ("DELETE FROM %cvalues%c WHERE id_configs = %d",
-                           priv->chrquot,
-                           priv->chrquot,
-                           priv->id_config);
-	if (gdaex_execute (priv->gdaex, sql) == -1)
+	if (priv->pluggable == NULL)
 		{
-			g_free (sql);
+			g_warning ("Not initialized.");
 			ret = FALSE;
 		}
-	else 
+	else
 		{
-			g_free (sql);
-			sql = g_strdup_printf ("DELETE FROM configs WHERE id = %d",
-			                       priv->id_config);
-			if (gdaex_execute (priv->gdaex, sql) == -1)
-				{
-					ret = FALSE;
-				}
-			else
-				{
-					confi_destroy (confi);
-				}
+			ret = confi_pluggable_remove (priv->pluggable);
+		}
+
+	if (ret)
+		{
+			confi_destroy (confi);
 		}
 
 	return ret;
@@ -536,6 +525,7 @@ confi_destroy (Confi *confi)
 	g_free (priv->name);
 	g_free (priv->description);
 	g_free (priv->root);
+	g_object_unref (priv->pluggable);
 }
 
 /**
-- 
2.49.0