From 0a8367524cec8d4d0dec1b3f05eeb2f8d1b6aedd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 21 Oct 2022 09:34:05 +0300 Subject: Update glib introspection data Based on 86430a27d26b9b72b02ff0b81eeaa5df0525646c. --- gir/gio-2.0.c | 10 +++--- gir/glib-2.0.c | 98 +++++++++++++++++++++++++++++++++++++------------------ gir/gmodule-2.0.c | 5 +++ 3 files changed, 76 insertions(+), 37 deletions(-) (limited to 'gir') diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index cbef7697..23112b3d 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -26831,7 +26831,7 @@ /** - * g_icon_equal: + * g_icon_equal: (virtual equal) * @icon1: (nullable): pointer to the first #GIcon. * @icon2: (nullable): pointer to the second #GIcon. * @@ -26843,7 +26843,7 @@ /** * g_icon_hash: (virtual hash) - * @icon: (not nullable): #gconstpointer to an icon object. + * @icon: (not nullable) (type Gio.Icon): #gconstpointer to an icon object. * * Gets a hash for an icon. * @@ -26871,7 +26871,7 @@ /** - * g_icon_serialize: + * g_icon_serialize: (virtual serialize) * @icon: a #GIcon * * Serializes a #GIcon into a #GVariant. An equivalent #GIcon can be retrieved @@ -26886,7 +26886,7 @@ /** - * g_icon_to_string: (virtual to_tokens) + * g_icon_to_string: * @icon: a #GIcon. * * Generates a textual representation of @icon that can be used for @@ -39562,7 +39562,7 @@ * * Gets @task's #GCancellable * - * Returns: (transfer none): @task's #GCancellable + * Returns: (nullable) (transfer none): @task's #GCancellable * Since: 2.36 */ diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 47583659..4532a38d 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -3068,7 +3068,7 @@ * meant to be portable across different compilers and must be placed * before the function declaration. * - * |[ * G_DEPRECATED * int my_mistake (void); * ]| @@ -3086,7 +3086,7 @@ * is meant to be portable across different compilers and must be placed * before the function declaration. * - * |[ * G_DEPRECATED_FOR(my_replacement) * int my_mistake (void); * ]| @@ -3305,7 +3305,7 @@ * G_GNUC_END_IGNORE_DEPRECATIONS * ]| * - * |[ * static void * test_deprecated_function (void) * { @@ -4291,6 +4291,18 @@ */ +/** + * G_OS_DARWIN: + * + * This macro is defined only on Apple operating systems (macOS or iOS). + * So you can bracket Apple-specific code in `\#ifdef G_OS_DARWIN`. + * + * Note that %G_OS_UNIX is also set. + * + * Since: 2.76 + */ + + /** * G_OS_UNIX: * @@ -6199,18 +6211,6 @@ * unescaped "#" outside a character class is encountered. This indicates * a comment that lasts until after the next newline. * - * When setting the %G_REGEX_JAVASCRIPT_COMPAT flag, pattern syntax and pattern - * matching is changed to be compatible with the way that regular expressions - * work in JavaScript. More precisely, a lonely ']' character in the pattern - * is a syntax error; the '\x' escape only allows 0 to 2 hexadecimal digits, and - * you must use the '\u' escape sequence with 4 hex digits to specify a unicode - * codepoint instead of '\x' or 'x{....}'. If '\x' or '\u' are not followed by - * the specified number of hex digits, they match 'x' and 'u' literally; also - * '\U' always matches 'U' instead of being an error in the pattern. Finally, - * pattern matching is modified so that back references to an unset subpattern - * group produces a match with the empty string instead of an error. See - * pcreapi(3) for more information. - * * Creating and manipulating the same #GRegex structure from different * threads is not a problem as #GRegex does not modify its internal * state between creation and destruction, on the other hand #GMatchInfo @@ -10717,16 +10717,18 @@ /** * g_async_queue_push: * @queue: a #GAsyncQueue - * @data: @data to push into the @queue + * @data: (not nullable): data to push onto the @queue + * + * Pushes the @data into the @queue. * - * Pushes the @data into the @queue. @data must not be %NULL. + * The @data parameter must not be %NULL. */ /** * g_async_queue_push_front: * @queue: a #GAsyncQueue - * @item: data to push into the @queue + * @item: (not nullable): data to push into the @queue * * Pushes the @item into the @queue. @item must not be %NULL. * In contrast to g_async_queue_push(), this function @@ -10740,7 +10742,7 @@ /** * g_async_queue_push_front_unlocked: * @queue: a #GAsyncQueue - * @item: data to push into the @queue + * @item: (not nullable): data to push into the @queue * * Pushes the @item into the @queue. @item must not be %NULL. * In contrast to g_async_queue_push_unlocked(), this function @@ -10756,7 +10758,7 @@ /** * g_async_queue_push_sorted: * @queue: a #GAsyncQueue - * @data: the @data to push into the @queue + * @data: (not nullable): the @data to push into the @queue * @func: the #GCompareDataFunc is used to sort @queue * @user_data: user data passed to @func. * @@ -10778,7 +10780,7 @@ /** * g_async_queue_push_sorted_unlocked: * @queue: a #GAsyncQueue - * @data: the @data to push into the @queue + * @data: the data to push into the @queue * @func: the #GCompareDataFunc is used to sort @queue * @user_data: user data passed to @func. * @@ -10805,9 +10807,11 @@ /** * g_async_queue_push_unlocked: * @queue: a #GAsyncQueue - * @data: @data to push into the @queue + * @data: (not nullable): data to push onto the @queue * - * Pushes the @data into the @queue. @data must not be %NULL. + * Pushes the @data into the @queue. + * + * The @data parameter must not be %NULL. * * This function must be called while holding the @queue's lock. */ @@ -10839,7 +10843,7 @@ /** * g_async_queue_remove: * @queue: a #GAsyncQueue - * @item: the data to remove from the @queue + * @item: (not nullable): the data to remove from the @queue * * Remove an item from the queue. * @@ -10929,7 +10933,7 @@ * and g_time_val_add() can be used. * * Returns: (nullable): data from the queue or %NULL, when no data is - * received before @end_time. + * received before @end_time. * Deprecated: use g_async_queue_timeout_pop(). */ @@ -10950,7 +10954,7 @@ * This function must be called while holding the @queue's lock. * * Returns: (nullable): data from the queue or %NULL, when no data is - * received before @end_time. + * received before @end_time. * Deprecated: use g_async_queue_timeout_pop_unlocked(). */ @@ -10966,7 +10970,7 @@ * If no data is received before the timeout, %NULL is returned. * * Returns: (nullable): data from the queue or %NULL, when no data is - * received before the timeout. + * received before the timeout. */ @@ -10983,7 +10987,7 @@ * This function must be called while holding the @queue's lock. * * Returns: (nullable): data from the queue or %NULL, when no data is - * received before the timeout. + * received before the timeout. */ @@ -10995,7 +10999,7 @@ * %NULL is returned. * * Returns: (nullable): data from the queue or %NULL, when no data is - * available immediately. + * available immediately. */ @@ -11009,7 +11013,7 @@ * This function must be called while holding the @queue's lock. * * Returns: (nullable): data from the queue or %NULL, when no data is - * available immediately. + * available immediately. */ @@ -12242,6 +12246,18 @@ */ +/** + * g_bookmark_file_copy: + * @bookmark: A #GBookmarkFile + * + * Deeply copies a @bookmark #GBookmarkFile object to a new one. + * + * Returns: (transfer full): the copy of @bookmark. Use + * g_bookmark_free() when finished using it. + * Since: 2.76 + */ + + /** * g_bookmark_file_free: * @bookmark: a #GBookmarkFile @@ -14080,14 +14096,20 @@ * @fd: A file descriptor * @error: a #GError * - * This wraps the close() call; in case of error, %errno will be + * This wraps the close() call. In case of error, %errno will be * preserved, but the error will also be stored as a #GError in @error. + * In case of success, %errno is undefined. * * Besides using #GError, there is another major reason to prefer this * function over the call provided by the system; on Unix, it will * attempt to correctly handle %EINTR, which has platform-specific * semantics. * + * It is a bug to call this function with an invalid file descriptor. + * + * Since 2.76, this function is guaranteed to be async-signal-safe if (and only + * if) @error is %NULL and @fd is a valid open file descriptor. + * * Returns: %TRUE on success, %FALSE if there was an error. * Since: 2.36 */ @@ -18915,11 +18937,17 @@ * * If found, the stolen key and value are removed from the hash table without * calling the key and value destroy functions, and ownership is transferred to - * the caller of this method; as with g_hash_table_steal(). + * the caller of this method, as with g_hash_table_steal(). That is the case + * regardless whether @stolen_key or @stolen_value output parameters are + * requested. * * You can pass %NULL for @lookup_key, provided the hash and equal functions * of @hash_table are %NULL-safe. * + * The dictionary implementation optimizes for having all values identical to + * their keys, for example by using g_hash_table_add(). When stealing both the + * key and the value from such a dictionary, the value will be %NULL. + * * Returns: %TRUE if the key was found in the #GHashTable * Since: 2.58 */ @@ -22228,6 +22256,12 @@ * the code which sets them. For example, custom keys from GLib all have a * `GLIB_` prefix. * + * Note that keys that expect UTF-8 strings (specifically `"MESSAGE"` and + * `"GLIB_DOMAIN"`) must be passed as NUL-terminated UTF-8 strings until GLib + * version 2.74.1 because the default log handler did not consider the length of + * the `GLogField`. Starting with GLib 2.74.1 this is fixed and + * non-NUL-terminated UTF-8 strings can be passed with their correct length. + * * The @log_domain will be converted into a `GLIB_DOMAIN` field. @log_level will * be converted into a * [`PRIORITY`](https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html#PRIORITY=) diff --git a/gir/gmodule-2.0.c b/gir/gmodule-2.0.c index 4716aad2..e07a8823 100644 --- a/gir/gmodule-2.0.c +++ b/gir/gmodule-2.0.c @@ -57,6 +57,11 @@ * non-default * [visibility flag](https://gcc.gnu.org/onlinedocs/gcc/Code-Gen-Options.html#index-fvisibility-1260) * such as `hidden`. + * + * This macro must only be used when compiling a shared module. Modules that + * support both shared and static linking should define their own macro that + * expands to %G_MODULE_EXPORT when compiling the shared module, but is empty + * when compiling the static module on Windows. */ -- cgit v1.2.1