From 4671b16b14c551bcc378c95f76177c732fc7aeb4 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sat, 1 Oct 2016 10:26:05 +0200
Subject: [PATCH] Plg db: wrong starting object for deleting keys in
::remove_path.
---
plugins/db/plgdb.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/plugins/db/plgdb.c b/plugins/db/plgdb.c
index bafaeea..25b0ef8 100644
--- a/plugins/db/plgdb.c
+++ b/plugins/db/plgdb.c
@@ -879,18 +879,21 @@ zak_confi_db_plugin_remove_path (ZakConfiPluggable *pluggable, const gchar *path
gchar *path_ = g_strdup (path);
/* removing every child key */
- GNode *node, *root;
+ GNode *node;
gint id = gdaex_data_model_get_field_value_integer_at (dm, 0, "id");
- node = g_node_new (path_);
- zak_confi_db_plugin_get_children (pluggable, node, id, path_);
+ ZakConfiKey *ck = g_new0 (ZakConfiKey, 1);
- root = g_node_get_root (node);
+ ck->config = g_strdup (priv->name);
+ ck->path = path_;
+ ck->key = gdaex_data_model_get_field_value_stringify_at (dm, 0, "key");
+ ck->value = "";
+ ck->description = "";
- if (g_node_n_nodes (root, G_TRAVERSE_ALL) > 1)
- {
- g_node_traverse (root, G_PRE_ORDER, G_TRAVERSE_ALL, -1, zak_confi_db_plugin_remove_path_traverse_func, (gpointer)pluggable);
- }
+ node = g_node_new (ck);
+ zak_confi_db_plugin_get_children (pluggable, node, id, path_);
+
+ g_node_traverse (node, G_POST_ORDER, G_TRAVERSE_ALL, -1, zak_confi_db_plugin_remove_path_traverse_func, (gpointer)pluggable);
/* removing the path */
ret = zak_confi_db_plugin_delete_id_from_db_values (pluggable, id);
--
2.49.0