diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2015-09-23 08:06:32 +0200 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2015-09-23 08:06:32 +0200 |
commit | 6d0d9938e34df351615d644ea3d2fc667fa6a22f (patch) | |
tree | e19339e9542846c779381201a8490564171e620c /gir/gio-2.0.c | |
parent | a984a0f57a8ab178762d5942e2d552121edae091 (diff) | |
download | gobject-introspection-6d0d9938e34df351615d644ea3d2fc667fa6a22f.tar.gz |
Update glib annotations from git master
Diffstat (limited to 'gir/gio-2.0.c')
-rw-r--r-- | gir/gio-2.0.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index fdcf9f84..0488eeef 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -6242,7 +6242,7 @@ * interface, in which case all objects in the list must implement it. * * The semantics are close to that of an array: - * g_list_model_get_length() returns the number of items in the list and + * g_list_model_get_n_items() returns the number of items in the list and * g_list_model_get_item() returns an item at a (0-based) position. In * order to allow implementations to calculate the list length lazily, * you can also iterate over items: starting from 0, repeatedly call @@ -28249,10 +28249,10 @@ /** * g_native_socket_address_new: - * @address: a #GNativeAddress - * @port: a port number + * @native: a native address object + * @len: the length of @native, in bytes * - * Creates a new #GNativeSocketAddress for @address and @port. + * Creates a new #GNativeSocketAddress for @native and @len. * * Returns: a new #GNativeSocketAddress * Since: 2.46 @@ -40350,7 +40350,7 @@ * @key: (in) (transfer none): a #GWin32RegistryKey * @watch_children: (in): %TRUE also watch the children of the @key, %FALSE * to watch the key only. - * @change_flags: (in): specifies the types of changes to watch for. + * @watch_flags: (in): specifies the types of changes to watch for. * @callback: (in) (nullable): a function to invoke when a change occurs. * @user_data: (in) (nullable): a pointer to pass to @callback on invocation. * @error: (nullable): a pointer to %NULL #GError, or %NULL @@ -40595,12 +40595,13 @@ /** * g_win32_registry_value_iter_get_data: * @iter: (in) (transfer none): a #GWin32RegistryValueIter + * @auto_expand: (in): %TRUE to automatically expand G_WIN32_REGISTRY_VALUE_EXPAND_STR to + * G_WIN32_REGISTRY_VALUE_STR * @value_data: (out callee-allocates) (optional) (transfer none): Pointer to a - * location to store the data of the value (in UTF-8, if it's a string). + * location to store the data of the value (in UTF-8, if it's a string) * @value_data_size: (out) (optional): Pointer to a location to store the length - * of @value_data, in bytes (including any NUL-terminators, if it's a - * string). - * %NULL if length is not needed. + * of @value_data, in bytes (including any NUL-terminators, if it's a string). + * %NULL if length is not needed * @error: (nullable): a pointer to %NULL #GError, or %NULL * * Stores the data of the value currently being iterated over in @value_data, @@ -40615,12 +40616,11 @@ * g_win32_registry_value_iter_get_data_w: * @iter: (in) (transfer none): a #GWin32RegistryValueIter * @auto_expand: (in): %TRUE to automatically expand G_WIN32_REGISTRY_VALUE_EXPAND_STR to - * G_WIN32_REGISTRY_VALUE_STR. + * G_WIN32_REGISTRY_VALUE_STR * @value_data: (out callee-allocates) (optional) (transfer none): Pointer to a - * location to store the data of the value (in UTF-16, if it's a string). - * @value_data_len: (out) (optional): Pointer to a location to store the size - * of @value_data, in bytes (including any NUL-terminators, if it's a - * string). + * location to store the data of the value (in UTF-16, if it's a string) + * @value_data_size: (out) (optional): Pointer to a location to store the size + * of @value_data, in bytes (including any NUL-terminators, if it's a string). * %NULL if length is not needed. * @error: (nullable): a pointer to %NULL #GError, or %NULL * |