[gobject-introspection] Update glib annotations from git master



commit 347b8e1687a99a0bb3bf945b6fe54067664e1413
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Jan 22 16:40:59 2014 +0100

    Update glib annotations from git master

 gir/gio-2.0.c     |   11 ++++++-----
 gir/gobject-2.0.c |    3 +--
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index f097877..c6cf754 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -20297,8 +20297,9 @@
  * This call does no blocking I/O.
  *
  * Returns: string with the relative path from @descendant
- *     to @parent. The returned string should be freed with
- *     g_free() when no longer needed.
+ *     to @parent, or %NULL if @descendant doesn't have @parent
+ *     as prefix. The returned string should be freed with g_free()
+ *     when no longer needed.
  */
 
 
@@ -34048,7 +34049,7 @@
  * The process must have been created with
  * %G_SUBPROCESS_FLAGS_STDERR_PIPE.
  *
- * Returns: the stderr pipe
+ * Returns: (transfer none): the stderr pipe
  * Since: 2.40
  */
 
@@ -34063,7 +34064,7 @@
  * The process must have been created with
  * %G_SUBPROCESS_FLAGS_STDIN_PIPE.
  *
- * Returns: the stdout pipe
+ * Returns: (transfer none): the stdout pipe
  * Since: 2.40
  */
 
@@ -34078,7 +34079,7 @@
  * The process must have been created with
  * %G_SUBPROCESS_FLAGS_STDOUT_PIPE.
  *
- * Returns: the stdout pipe
+ * Returns: (transfer none): the stdout pipe
  * Since: 2.40
  */
 
diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c
index c519b7c..aa6019f 100644
--- a/gir/gobject-2.0.c
+++ b/gir/gobject-2.0.c
@@ -2531,8 +2531,7 @@
  * @notify: a function to call when this reference is the
  *  last reference to the object, or is no longer
  *  the last reference.
- * @data: (allow-none): data to pass to @notify, or %NULL to
- *  match any toggle refs with the @notify argument.
+ * @data: data to pass to @notify
  *
  * Removes a reference added with g_object_add_toggle_ref(). The
  * reference count of the object is decreased by one.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]