From 354ac2dfbef66eba1780a5068bff408d656f69fb Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sun, 23 Nov 2014 12:14:28 +0100
Subject: [PATCH] Some adjustments for introspection (boxed ConfiKey).

---
 src/libconfi.c | 50 +++++++++++++++++++++++++++++++++++++++++++-------
 src/libconfi.h | 31 ++++++++++++++++++++-----------
 tests/gir.py   | 31 +++++++++++++++++++++++++++++--
 3 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/src/libconfi.c b/src/libconfi.c
index 780ecc2..361c805 100644
--- a/src/libconfi.c
+++ b/src/libconfi.c
@@ -26,6 +26,37 @@
 
 #include "libconfi.h"
 
+
+ConfiKey
+*confi_key_copy (ConfiKey *key)
+{
+	ConfiKey *b;
+
+	b = g_slice_new (ConfiKey);
+	b->id_config = key->id_config;
+	b->id = key->id;
+	b->id_parent = key->id_parent;
+	b->key = g_strdup (key->key);
+	b->value = g_strdup (key->value);
+	b->description = g_strdup (key->description);
+	b->path = g_strdup (key->path);
+
+	return b;
+}
+
+void
+confi_key_free (ConfiKey *key)
+{
+	g_free (key->key);
+	g_free (key->value);
+	g_free (key->description);
+	g_free (key->path);
+	g_slice_free (ConfiKey, key);
+}
+
+G_DEFINE_BOXED_TYPE (ConfiKey, confi_key, confi_key_copy, confi_key_free)
+
+
 enum
 {
 	PROP_0,
@@ -61,9 +92,9 @@ struct _ConfiPrivate
 	{
 		GdaEx *gdaex;
 		gint id_config;
-		gchar *name,
-		      *description,
-		      *root;
+		gchar *name;
+		gchar *description;
+		gchar *root;
 		GHashTable *values;
 
 		gchar chrquot;
@@ -206,7 +237,7 @@ Confi
  * confi_get_configs_list:
  * @cnc_string: the connection string to use to connect to database that
  * contains configuration.
- * @filter:
+ * @filter: (nullable):
  *
  * Returns: (element-type Confi) (transfer container):  a #GList of #Confi. If there's no configurations, returns a valid
  * #GList but with a unique NULL element.
@@ -216,7 +247,8 @@ GList
                          const gchar *filter)
 {
 	GList *lst = NULL;
-	gchar *sql, *where = "";
+	gchar *sql;
+	gchar *where = "";
 
 	GdaEx *gdaex = gdaex_new_from_string (cnc_string);
 
@@ -273,6 +305,7 @@ GList
  * confi_get_tree:
  * @confi: a #Confi object.
  *
+ * Returns: a #GNode.
  */
 GNode
 *confi_get_tree (Confi *confi)
@@ -559,12 +592,14 @@ confi_remove_path (Confi *confi, const gchar *path)
 gchar
 *confi_path_get_value (Confi *confi, const gchar *path)
 {
-	gchar *ret = NULL,
-	      *path_;
+	gchar *ret;
+	gchar *path_;
 	gpointer *gp;
 
 	ConfiPrivate *priv = CONFI_GET_PRIVATE (confi);
 
+	ret = NULL;
+
 	path_ = path_normalize (confi, path);
 	if (path_ == NULL)
 		{
@@ -673,6 +708,7 @@ confi_path_move (Confi *confi, const gchar *path, const gchar *parent)
  * @confi: a #Confi object.
  * @path: the key's path to get.
  *
+ * Returns: (transfer full): a #ConfiKey from @path
  */
 ConfiKey
 *confi_path_get_confi_key (Confi *confi, const gchar *path)
diff --git a/src/libconfi.h b/src/libconfi.h
index 4ebf8db..dc2a5fa 100644
--- a/src/libconfi.h
+++ b/src/libconfi.h
@@ -25,6 +25,26 @@
 G_BEGIN_DECLS
 
 
+#define CONFI_TYPE_KEY (confi_key_get_type ())
+
+GType confi_key_get_type ();
+
+typedef struct _ConfiKey ConfiKey;
+struct _ConfiKey
+	{
+		gint id_config;
+		gint id;
+		gint id_parent;
+		gchar *key;
+		gchar *value;
+		gchar *description;
+		gchar *path;
+	};
+
+ConfiKey *confi_key_copy (ConfiKey *key);
+void confi_key_free (ConfiKey *key);
+
+
 #define TYPE_CONFI                 (confi_get_type ())
 #define CONFI(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFI, Confi))
 #define CONFI_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFI, ConfiClass))
@@ -46,17 +66,6 @@ struct _ConfiClass
 		GObjectClass parent_class;
 	};
 
-typedef struct
-	{
-		gint id_config,
-		     id,
-		     id_parent;
-		gchar *key,
-		      *value,
-		      *description,
-		      *path;
-	} ConfiKey;
-
 GType confi_get_type (void);
 
 Confi *confi_new (const gchar *cnc_string,
diff --git a/tests/gir.py b/tests/gir.py
index 33a1948..dc53ec8 100644
--- a/tests/gir.py
+++ b/tests/gir.py
@@ -1,10 +1,37 @@
 #!/usr/bin/env python2
 
+from gi.repository import GLib
 from gi.repository import Confi
 
 # Create a new object
 confi = Confi.Confi.new("PostgreSQL://postgres:postgres@HOST=localhost;DB_NAME=confi", "Default", None, False)
 
-value = confi.path_get_value ("folder/key1/key1_2");
+print("Properties of a Confi object: ")
+print(dir(confi.props))
 
-print(value)
\ No newline at end of file
+value = confi.path_get_value ("folder/key1/key1_2")
+
+print("Value from key \"folder/key1/key1_2\": " + str(value))
+
+key = confi.path_get_confi_key ("folder/key1/key1_2")
+print("Path of confi key \"folder/key1/key1_2\": " + str(key.path))
+print("Value from confi key \"folder/key1/key1_2\": " + str(key.value))
+
+list = confi.get_configs_list ("PostgreSQL://postgres:postgres@HOST=localhost;DB_NAME=confi");
+print("The name of configuration 0: " + str(list[0].get_property("name")))
+
+confi.set_root ("key2")
+
+value = confi.path_get_value ("key2-1")
+
+print("Value from key \"key2-1\": " + str(value))
+
+confi.set_root ("/")
+confi.add_key ("folder", "key3");
+confi.add_key_with_value ("folder/key3", "key3-1", "value of key3-1 added programmatically")
+
+confi.set_root ("folder/key3")
+
+value = confi.path_get_value ("key3-1")
+
+print("Value from key \"key3-1\": " + str(value))
-- 
2.49.0