Use of libzakutilsjsonxml.

diff --git a/configure.ac b/configure.ac
index d3111ac96092d7ee9ff87b4bd33c879ca8048092..d88ad6b08a4888e877b8cc22ad760b778e161385 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,7 @@ AM_GLIB_GNU_GETTEXT
 # Checks for libraries.
 PKG_CHECK_MODULES(ZAKFORMJSON, [libzakform
                                 libzakutils
+                                libzakutilsjsonxml
                                 json-glib-1.0])
 
 AC_SUBST(ZAKFORMJSON_CFLAGS)

diff --git a/libzakformjson.pc.in b/libzakformjson.pc.in
index b491991a9af446ae755acaa28dd3c21eb77b646b..a3cf6c199da298b11836bc7ab4d48d24739c2f5c 100644 (file)
--- a/libzakformjson.pc.in
+++ b/libzakformjson.pc.in
@@ -7,6 +7,6 @@ modulesdir=@libdir@/@PACKAGE@/modules
 Name: @PACKAGE_NAME@
 Description: Class for ZakFormIProvider based on json format.
 Version: @PACKAGE_VERSION@
-Requires: libzakform libzakutils json-glib-1.0
+Requires: libzakform libzakutils libzakutilsjsonxml json-glib-1.0
 Libs: -L${libdir} -lzakformjson
 Cflags: -I${includedir}

diff --git a/src/form.c b/src/form.c
index cdea69cfd1531e6f8fa0d886ccc06db79babed7a..f2fb3b5d3b739900d10aa2f1d8a362c70a409a05 100644 (file)
--- a/src/form.c
+++ b/src/form.c
@@ -24,6 +24,7 @@
 
 #include <libzakform/libzakform.h>
 #include <libzakutils/libzakutils.h>
+#include <libzakutilsjsonxml/libzakutilsjsonxml.h>
 #include <json-glib/json-glib.h>
 
 #include "form.h"
@@ -158,13 +159,9 @@ ZakFormJsonProvider
 
        if (priv->root == NULL)
                {
-                       JsonArray *jar;
-
                        g_warning ("Unable to get json root element.");
 
-                       jar = json_array_new ();
-                       priv->root = json_node_new (JSON_NODE_ARRAY);
-                       json_node_init_array (priv->root, jar);
+                       priv->root = zak_utils_json_node_new_array ();
 
                        zak_form_json_provider_write_to_file (zak_form_json_provider);
                }
@@ -208,13 +205,9 @@ ZakFormJsonProvider
 
        if (priv->root == NULL)
                {
-                       JsonArray *jar;
-
                        g_warning ("Unable to get json root element.");
 
-                       jar = json_array_new ();
-                       priv->root = json_node_new (JSON_NODE_ARRAY);
-                       json_node_init_array (priv->root, jar);
+                       priv->root = zak_utils_json_node_new_array ();
                }
 
        return zak_form_json_provider;
@@ -420,11 +413,10 @@ zak_form_json_provider_insert (ZakFormIProvider *provider, GPtrArray *elements)
                {
                        JsonNode *jnode;
 
-                       obj = json_object_new ();
-
-                       jnode = json_node_new (JSON_NODE_OBJECT);
-                       json_node_init_object (jnode, obj);
+                       jnode = zak_utils_json_node_new_object ();
                        json_array_add_element (json_node_get_array (priv->root), jnode);
+
+                       obj = json_node_get_object (jnode);
                }
 
        for (i = 0; i < elements->len; i++)