[json-glib/json-glib-0-12] Fix introspection annotations (cherry picked from commit 8bb22d7de00f15ef44cad502d757639d8a4e8973)
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [json-glib/json-glib-0-12] Fix introspection annotations (cherry picked from commit 8bb22d7de00f15ef44cad502d757639d8a4e8973)
- Date: Tue, 15 Feb 2011 16:28:52 +0000 (UTC)
commit 0ba35c4514f096c639224a70f38ef67849e7245e
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Tue Feb 15 16:28:07 2011 +0000
Fix introspection annotations
(cherry picked from commit 8bb22d7de00f15ef44cad502d757639d8a4e8973)
Signed-off-by: Emmanuele Bassi <ebassi linux intel com>
json-glib/json-node.c | 7 ++++---
json-glib/json-object.c | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/json-glib/json-node.c b/json-glib/json-node.c
index 529bf5a..cf25cac 100644
--- a/json-glib/json-node.c
+++ b/json-glib/json-node.c
@@ -341,7 +341,7 @@ json_node_dup_array (JsonNode *node)
/**
* json_node_get_value:
* @node: a #JsonNode
- * @value: (out): return location for an uninitialized value
+ * @value: (out caller-allocates): return location for an uninitialized value
*
* Retrieves a value from a #JsonNode and copies into @value. When done
* using it, call g_value_unset() on the #GValue.
@@ -509,7 +509,7 @@ json_node_type_get_name (JsonNodeType node_type)
/**
* json_node_set_parent:
* @node: a #JsonNode
- * @parent: the parent #JsonNode of @node
+ * @parent: (transfer none): the parent #JsonNode of @node
*
* Sets the parent #JsonNode of @node
*
@@ -530,7 +530,8 @@ json_node_set_parent (JsonNode *node,
*
* Retrieves the parent #JsonNode of @node.
*
- * Return value: (transfer none) the parent node, or %NULL if @node is the root node
+ * Return value: (transfer none): the parent node, or %NULL if @node is
+ * the root node
*/
JsonNode *
json_node_get_parent (JsonNode *node)
diff --git a/json-glib/json-object.c b/json-glib/json-object.c
index d3525ff..4bcd053 100644
--- a/json-glib/json-object.c
+++ b/json-glib/json-object.c
@@ -205,7 +205,7 @@ json_object_add_member (JsonObject *object,
* json_object_set_member:
* @object: a #JsonObject
* @member_name: the name of the member
- * @node: the value of the member
+ * @node: (transfer full): the value of the member
*
* Sets @node as the value of @member_name inside @object.
*
@@ -500,7 +500,7 @@ json_object_get_values (JsonObject *object)
* Retrieves a copy of the #JsonNode containing the value of @member_name
* inside a #JsonObject
*
- * Return value: (transfer full) a copy of the node for the requested
+ * Return value: (transfer full): a copy of the node for the requested
* object member or %NULL. Use json_node_free() when done.
*
* Since: 0.6
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]