diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-01-11 15:59:14 +0100 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-01-11 15:59:14 +0100 |
| commit | d75842ff4c8c9d78dbd5462409ab2c93600fa9a6 (patch) | |
| tree | 86def8b54a1cb6db27a3bff6c6e6caada203ad13 /gio/gmemoryinputstream.c | |
| parent | 65bd1f526d86ce08d6fa4d7d6fc1140198c9aef1 (diff) | |
| parent | fabf506b8d5baf8f59fca563e6f1a62be5148112 (diff) | |
| download | glib-wip/gsettings-list.tar.gz | |
Merge branch 'master' into wip/gsettings-listwip/gsettings-list
Diffstat (limited to 'gio/gmemoryinputstream.c')
| -rw-r--r-- | gio/gmemoryinputstream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gio/gmemoryinputstream.c b/gio/gmemoryinputstream.c index 397c6a5b9..9107b22a8 100644 --- a/gio/gmemoryinputstream.c +++ b/gio/gmemoryinputstream.c @@ -203,9 +203,9 @@ g_memory_input_stream_new (void) /** * g_memory_input_stream_new_from_data: - * @data: input data + * @data: (array length=len) (element-type guint8): input data * @len: length of the data, may be -1 if @data is a nul-terminated string - * @destroy: function that is called to free @data, or %NULL + * @destroy: (allow-none): function that is called to free @data, or %NULL * * Creates a new #GMemoryInputStream with data in memory of a given size. * @@ -229,9 +229,9 @@ g_memory_input_stream_new_from_data (const void *data, /** * g_memory_input_stream_add_data: * @stream: a #GMemoryInputStream - * @data: input data + * @data: (array length=len) (element-type guint8): input data * @len: length of the data, may be -1 if @data is a nul-terminated string - * @destroy: function that is called to free @data, or %NULL + * @destroy: (allow-none): function that is called to free @data, or %NULL * * Appends @data to data that can be read from the input stream */ |