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/gpollableinputstream.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/gpollableinputstream.c')
| -rw-r--r-- | gio/gpollableinputstream.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gio/gpollableinputstream.c b/gio/gpollableinputstream.c index d6937d835..912eaea27 100644 --- a/gio/gpollableinputstream.c +++ b/gio/gpollableinputstream.c @@ -115,9 +115,9 @@ g_pollable_input_stream_is_readable (GPollableInputStream *stream) } /** - * g_pollable_input_stream_create_source: + * g_pollable_input_stream_create_source: (skip) * @stream: a #GPollableInputStream. - * @cancellable: a #GCancellable, or %NULL + * @cancellable: (allow-none): a #GCancellable, or %NULL * * Creates a #GSource that triggers when @stream can be read, or * @cancellable is triggered or an error occurs. The callback on the @@ -128,7 +128,7 @@ g_pollable_input_stream_is_readable (GPollableInputStream *stream) * triggers, so you should use g_pollable_input_stream_read_nonblocking() * rather than g_input_stream_read() from the callback. * - * Returns: a new #GSource + * Returns: (transfer full): a new #GSource * * Since: 2.28 */ @@ -165,7 +165,7 @@ g_pollable_input_stream_default_read_nonblocking (GPollableInputStream *stream, * @buffer: a buffer to read data into (which should be at least @size * bytes long). * @size: the number of bytes you want to read - * @cancellable: a #GCancellable, or %NULL + * @cancellable: (allow-none): a #GCancellable, or %NULL * @error: #GError for error reporting, or %NULL to ignore. * * Attempts to read up to @size bytes from @stream into @buffer, as @@ -180,6 +180,7 @@ g_pollable_input_stream_default_read_nonblocking (GPollableInputStream *stream, * may happen if you call this method after a source triggers due * to having been cancelled. * + * Virtual: read_nonblocking * Return value: the number of bytes read, or -1 on error (including * %G_IO_ERROR_WOULD_BLOCK). */ @@ -275,7 +276,7 @@ static GSourceFuncs pollable_source_funcs = }; /** - * g_pollable_source_new: + * g_pollable_source_new: (skip) * @pollable_stream: the stream associated with the new source * * Utility method for #GPollableInputStream and #GPollableOutputStream @@ -284,7 +285,7 @@ static GSourceFuncs pollable_source_funcs = * anything on its own; use g_source_add_child_source() to add other * sources to it to cause it to trigger. * - * Return value: the new #GSource. + * Return value: (transfer full): the new #GSource. * * Since: 2.28 */ |