Imported Upstream version 1.2.4

[platform/upstream/json-glib.git] / json-glib / json-gvariant.c

diff --git a/json-glib/json-gvariant.c b/json-glib/json-gvariant.c
index 6d55fb8..afa6405 100644 (file)
--- a/json-glib/json-gvariant.c
+++ b/json-glib/json-gvariant.c
@@ -516,10 +516,10 @@ json_node_assert_type (JsonNode       *json_node,
       (type == JSON_NODE_VALUE &&
        (json_node_get_value_type (json_node) != sub_type)))
     {
-      /* translators: the '%s' is the type name */
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_DATA,
+                   /* translators: the '%s' is the type name */
                    _("Unexpected type '%s' in JSON node"),
                    g_type_name (json_node_get_value_type (json_node)));
       return FALSE;
@@ -761,7 +761,7 @@ json_to_gvariant_array (JsonNode     *json_node,
   JsonArray *array;
   GList *children = NULL;
   gboolean roll_back = FALSE;
-  const gchar *orig_signature;
+  const gchar *orig_signature = NULL;
   gchar *child_signature;
 
   array = json_node_get_array (json_node);