diff options
| author | Giovanni Campagna <gcampagna@src.gnome.org> | 2012-02-13 16:42:44 +0100 |
|---|---|---|
| committer | Giovanni Campagna <gcampagna@src.gnome.org> | 2012-02-14 19:05:08 +0100 |
| commit | d240b883155183fcb9723766b4e4b4b5a0db57ff (patch) | |
| tree | 62a7b011f9c4c0cc8546aafb1cf217aa765a0905 | |
| parent | 5b8a6900d3c0e757044b7f5c6e9eb54f9cb18154 (diff) | |
| download | glib-d240b883155183fcb9723766b4e4b4b5a0db57ff.tar.gz | |
GKeyFile: fix annotation of g_key_file_load_from_data
(array) without (element-type) means "array of the same type as
the C type", so gchar* with (array) is interpreted as an array of
strings. Since GKeyFiles must be UTF-8 encoded anyway, just
annotate it as a string.
https://bugzilla.gnome.org/show_bug.cgi?id=658484
| -rw-r--r-- | glib/gkeyfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c index 7b1f59514..5f3610ca2 100644 --- a/glib/gkeyfile.c +++ b/glib/gkeyfile.c @@ -862,8 +862,8 @@ g_key_file_load_from_file (GKeyFile *key_file, /** * g_key_file_load_from_data: * @key_file: an empty #GKeyFile struct - * @data: (array length=length): key file loaded in memory - * @length: the length of @data in bytes + * @data: key file loaded in memory + * @length: the length of @data in bytes (or -1 if data is nul-terminated) * @flags: flags from #GKeyFileFlags * @error: return location for a #GError, or %NULL * |