From 0aae977ac13966120f3efc1bcdac4d5be1d97aa3 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Thu, 21 Apr 2011 23:45:59 +0200 Subject: [PATCH] gdbusintrospection: fix introspection of DBus Introspection structures Correctly mark fields as arrays (requires changing gobject-introspection to pick those). https://bugzilla.gnome.org/show_bug.cgi?id=646635 --- gio/gdbusintrospection.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gio/gdbusintrospection.h b/gio/gdbusintrospection.h index 128009810..31187ebf2 100644 --- a/gio/gdbusintrospection.h +++ b/gio/gdbusintrospection.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS * @ref_count: The reference count or -1 if statically allocated. * @key: The name of the annotation, e.g. "org.freedesktop.DBus.Deprecated". * @value: The value of the annotation. - * @annotations: A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. + * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. * * Information about an annotation. * @@ -55,7 +55,7 @@ struct _GDBusAnnotationInfo * @ref_count: The reference count or -1 if statically allocated. * @name: Name of the argument, e.g. @unix_user_id. * @signature: D-Bus signature of the argument (a single complete type). - * @annotations: A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. + * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. * * Information about an argument for a method or a signal. * @@ -73,9 +73,9 @@ struct _GDBusArgInfo * GDBusMethodInfo: * @ref_count: The reference count or -1 if statically allocated. * @name: The name of the D-Bus method, e.g. @RequestName. - * @in_args: A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no in arguments. - * @out_args: A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no out arguments. - * @annotations: A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. + * @in_args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no in arguments. + * @out_args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no out arguments. + * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. * * Information about a method on an D-Bus interface. * @@ -94,8 +94,8 @@ struct _GDBusMethodInfo * GDBusSignalInfo: * @ref_count: The reference count or -1 if statically allocated. * @name: The name of the D-Bus signal, e.g. "NameOwnerChanged". - * @args: A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no arguments. - * @annotations: A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. + * @args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no arguments. + * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. * * Information about a signal on a D-Bus interface. * @@ -115,7 +115,7 @@ struct _GDBusSignalInfo * @name: The name of the D-Bus property, e.g. "SupportedFilesystems". * @signature: The D-Bus signature of the property (a single complete type). * @flags: Access control flags for the property. - * @annotations: A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. + * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. * * Information about a D-Bus property on a D-Bus interface. * @@ -134,10 +134,10 @@ struct _GDBusPropertyInfo * GDBusInterfaceInfo: * @ref_count: The reference count or -1 if statically allocated. * @name: The name of the D-Bus interface, e.g. "org.freedesktop.DBus.Properties". - * @methods: A pointer to a %NULL-terminated array of pointers to #GDBusMethodInfo structures or %NULL if there are no methods. - * @signals: A pointer to a %NULL-terminated array of pointers to #GDBusSignalInfo structures or %NULL if there are no signals. - * @properties: A pointer to a %NULL-terminated array of pointers to #GDBusPropertyInfo structures or %NULL if there are no properties. - * @annotations: A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. + * @methods: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusMethodInfo structures or %NULL if there are no methods. + * @signals: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusSignalInfo structures or %NULL if there are no signals. + * @properties: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusPropertyInfo structures or %NULL if there are no properties. + * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. * * Information about a D-Bus interface. * @@ -157,9 +157,9 @@ struct _GDBusInterfaceInfo * GDBusNodeInfo: * @ref_count: The reference count or -1 if statically allocated. * @path: The path of the node or %NULL if omitted. Note that this may be a relative path. See the D-Bus specification for more details. - * @interfaces: A pointer to a %NULL-terminated array of pointers to #GDBusInterfaceInfo structures or %NULL if there are no interfaces. - * @nodes: A pointer to a %NULL-terminated array of pointers to #GDBusNodeInfo structures or %NULL if there are no nodes. - * @annotations: A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. + * @interfaces: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusInterfaceInfo structures or %NULL if there are no interfaces. + * @nodes: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusNodeInfo structures or %NULL if there are no nodes. + * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations. * * Information about nodes in a remote object hierarchy. *