summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2014-01-23 17:28:21 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2014-01-23 17:28:21 +0100
commit34c141e6f28335e1ba7daab429edda09492dad97 (patch)
tree5851c23d56a4e9ce93e1604d8c5e24724a83e62e
parentd9656dbaa6caba0088ae6005afaf315df691cbff (diff)
downloadgobject-introspection-34c141e6f28335e1ba7daab429edda09492dad97.tar.gz
Update glib annotations from git master
-rw-r--r--gir/gio-2.0.c2
-rw-r--r--gir/glib-2.0.c6
-rw-r--r--gir/gobject-2.0.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index c6cf754e..d19178b2 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -31229,7 +31229,7 @@
* #GSimpleProxyResolver:ignore-hosts for more details on how the
* arguments are interpreted.
*
- * Returns: a new #GSimpleProxyResolver
+ * Returns: (transfer full): a new #GSimpleProxyResolver
* Since: 2.36
*/
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index a1bbb4fc..bb403b15 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -15142,7 +15142,7 @@
/**
* g_free:
- * @mem: the memory to free
+ * @mem: (allow-none): the memory to free
*
* Frees the memory pointed to by @mem.
* If @mem is %NULL it simply returns.
@@ -23550,7 +23550,7 @@
/**
* g_realloc:
- * @mem: the memory to reallocate
+ * @mem: (allow-none): the memory to reallocate
* @n_bytes: new size of the memory in bytes
*
* Reallocates the memory pointed to by @mem, so that it now has space for
@@ -23565,7 +23565,7 @@
/**
* g_realloc_n:
- * @mem: the memory to reallocate
+ * @mem: (allow-none): the memory to reallocate
* @n_blocks: the number of blocks to allocate
* @n_block_bytes: the size of each block in bytes
*
diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c
index aa6019f5..ab618f62 100644
--- a/gir/gobject-2.0.c
+++ b/gir/gobject-2.0.c
@@ -812,7 +812,7 @@
*
* Provide a copy of a boxed structure @src_boxed which is of type @boxed_type.
*
- * Returns: The newly created copy of the boxed structure.
+ * Returns: (transfer full): The newly created copy of the boxed structure.
*/