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/gsocketaddressenumerator.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/gsocketaddressenumerator.c')
| -rw-r--r-- | gio/gsocketaddressenumerator.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gio/gsocketaddressenumerator.c b/gio/gsocketaddressenumerator.c index 1886f3602..2193860bf 100644 --- a/gio/gsocketaddressenumerator.c +++ b/gio/gsocketaddressenumerator.c @@ -50,7 +50,7 @@ g_socket_address_enumerator_class_init (GSocketAddressEnumeratorClass *enumerato /** * g_socket_address_enumerator_next: * @enumerator: a #GSocketAddressEnumerator - * @cancellable: optional #GCancellable object, %NULL to ignore. + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. * @error: a #GError. * * Retrieves the next #GSocketAddress from @enumerator. Note that this @@ -115,9 +115,10 @@ g_socket_address_enumerator_real_next_async (GSocketAddressEnumerator *enumerato /** * g_socket_address_enumerator_next_async: * @enumerator: a #GSocketAddressEnumerator - * @cancellable: optional #GCancellable object, %NULL to ignore. - * @callback: a #GAsyncReadyCallback to call when the request is satisfied - * @user_data: the data to pass to callback function + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @callback: (scope async): a #GAsyncReadyCallback to call when the request + * is satisfied + * @user_data: (closure): the data to pass to callback function * * Asynchronously retrieves the next #GSocketAddress from @enumerator * and then calls @callback, which must call |