From f2bd54d0c5e3093ad141de6142277a27b82147e1 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Wed, 1 Jun 2011 16:45:43 +0200 Subject: [PATCH] gvariant: fix introspection annotations g_variant_get_strv and g_variant_get_bytestring return arrays that are null terminated and have an explicit length. Since gjs doesn't support (out) arrays with length, mark them also null-terminated (but leave the length annotation, so pygobject can remove the argument) https://bugzilla.gnome.org/show_bug.cgi?id=646635 --- glib/gvariant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glib/gvariant.c b/glib/gvariant.c index b7d458a..2cf7fe9 100644 --- a/glib/gvariant.c +++ b/glib/gvariant.c @@ -1358,7 +1358,7 @@ g_variant_new_strv (const gchar * const *strv, * g_variant_get_strv: * @value: an array of strings #GVariant * @length: (out) (allow-none): the length of the result, or %NULL - * @returns: (array length=length) (transfer container): an array of constant + * @returns: (array length=length zero-terminated=1) (transfer container): an array of constant * strings * * Gets the contents of an array of strings #GVariant. This call @@ -1408,7 +1408,7 @@ g_variant_get_strv (GVariant *value, * g_variant_dup_strv: * @value: an array of strings #GVariant * @length: (out) (allow-none): the length of the result, or %NULL - * @returns: (array length=length) (transfer full): an array of strings + * @returns: (array length=length zero-terminated=1) (transfer full): an array of strings * * Gets the contents of an array of strings #GVariant. This call * makes a deep copy; the return result should be released with -- 2.7.4