summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Dahlin <johan@gnome.org>2010-09-23 23:21:57 -0300
committerJohan Dahlin <johan@gnome.org>2010-09-24 11:03:51 -0300
commit33e12c4a144f97b295e0e7ba560042d071a5f7d6 (patch)
treea7d5aa01f958f48db5273991872e9d3fb388482f
parente262dcaf557df83bd40572a8f94032a4da6148c5 (diff)
downloadgobject-introspection-33e12c4a144f97b295e0e7ba560042d071a5f7d6.tar.gz
Fix a couple of broken annotations
-rw-r--r--gir/gio-2.0.c4
-rw-r--r--gir/glib-2.0.c4
-rw-r--r--tests/scanner/annotation.c2
-rw-r--r--tests/scanner/annotation.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 7f0e8ee1..33906a0f 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -439,14 +439,14 @@
* @settings:
* @key:
*
- * Return value: (array zero-terminated-1) (transfer full):
+ * Return value: (array zero-terminated=1) (transfer full):
*/
/**
* g_settings_set_strv:
* @settings:
* @key:
- * @value: (array zero-terminated-1):
+ * @value: (array zero-terminated=1):
*
*/
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 3fde21d6..f5aa8a59 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -89,12 +89,12 @@
/**
* GSourceFunc:
- * @data: (closure):
+ * @data: (closure data):
*/
/**
* GIOFunc:
- * @data: (closure):
+ * @data: (closure data):
*/
/**
diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c
index e2e0991f..275ec0d6 100644
--- a/tests/scanner/annotation.c
+++ b/tests/scanner/annotation.c
@@ -290,7 +290,7 @@ annotation_object_calleeowns (AnnotationObject *object, GObject **toown)
*
* This is a test for out arguments, one transferred, other not
*
- * @toown1: (out) (transfer): a #GObject
+ * @toown1: (out) (transfer full): a #GObject
* @toown2: (out) (transfer none): a #GObject
* Return value: an int
*/
diff --git a/tests/scanner/annotation.h b/tests/scanner/annotation.h
index e4f29065..559ea705 100644
--- a/tests/scanner/annotation.h
+++ b/tests/scanner/annotation.h
@@ -23,7 +23,7 @@ typedef GList* (*AnnotationListCallback) (GList *in);
/**
* AnnotationNotifyFunc:
- * @data: (closure): The user data
+ * @data: (closure data): The user data
*
* This is a callback with a 'closure' argument that is not named
* 'user_data' and hence has to be annotated.