diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2020-02-28 08:23:38 +0100 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2020-02-28 08:23:38 +0100 |
commit | 7a500e772466ce5b06de7c9867856731d222d6c3 (patch) | |
tree | ba70557b1234274874f20b5bbf7f7f4f43ba3821 /gir | |
parent | 65c4b00f9bae38a095c68870137a39ea27006944 (diff) | |
download | gobject-introspection-7a500e772466ce5b06de7c9867856731d222d6c3.tar.gz |
Update glib annotations to 2.64.0
Diffstat (limited to 'gir')
-rw-r--r-- | gir/gio-2.0.c | 40 | ||||
-rw-r--r-- | gir/glib-2.0.c | 20 |
2 files changed, 45 insertions, 15 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index f9df1751..2d4e7bac 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -4795,7 +4795,7 @@ * initialization for all of these in a single place. * * Regardless of which of these entry points is used to start the - * application, GApplication passes some "platform data from the + * application, GApplication passes some ‘platform data’ from the * launching instance to the primary instance, in the form of a * #GVariant dictionary mapping strings to variants. To use platform * data, override the @before_emit or @after_emit virtual functions @@ -11570,14 +11570,14 @@ * * It is important to use the proper GVariant format when retrieving * the options with g_variant_dict_lookup(): - * - for %G_OPTION_ARG_NONE, use b - * - for %G_OPTION_ARG_STRING, use &s - * - for %G_OPTION_ARG_INT, use i - * - for %G_OPTION_ARG_INT64, use x - * - for %G_OPTION_ARG_DOUBLE, use d - * - for %G_OPTION_ARG_FILENAME, use ^ay - * - for %G_OPTION_ARG_STRING_ARRAY, use &as - * - for %G_OPTION_ARG_FILENAME_ARRAY, use ^aay + * - for %G_OPTION_ARG_NONE, use `b` + * - for %G_OPTION_ARG_STRING, use `&s` + * - for %G_OPTION_ARG_INT, use `i` + * - for %G_OPTION_ARG_INT64, use `x` + * - for %G_OPTION_ARG_DOUBLE, use `d` + * - for %G_OPTION_ARG_FILENAME, use `^&ay` + * - for %G_OPTION_ARG_STRING_ARRAY, use `^a&s` + * - for %G_OPTION_ARG_FILENAME_ARRAY, use `^a&ay` * * Since: 2.40 */ @@ -13251,6 +13251,13 @@ * * Stops owning a name. * + * Note that there may still be D-Bus traffic to process (relating to owning + * and unowning the name) in the current thread-default #GMainContext after + * this function has returned. You should continue to iterate the #GMainContext + * until the #GDestroyNotify function passed to g_bus_own_name() is called, in + * order to avoid memory leaks through callbacks queued on the #GMainContext + * after it’s stopped being iterated. + * * Since: 2.26 */ @@ -13261,6 +13268,13 @@ * * Stops watching a name. * + * Note that there may still be D-Bus traffic to process (relating to watching + * and unwatching the name) in the current thread-default #GMainContext after + * this function has returned. You should continue to iterate the #GMainContext + * until the #GDestroyNotify function passed to g_bus_watch_name() is called, in + * order to avoid memory leaks through callbacks queued on the #GMainContext + * after it’s stopped being iterated. + * * Since: 2.26 */ @@ -16403,6 +16417,14 @@ * * Unsubscribes from signals. * + * Note that there may still be D-Bus traffic to process (relating to this + * signal subscription) in the current thread-default #GMainContext after this + * function has returned. You should continue to iterate the #GMainContext + * until the #GDestroyNotify function passed to + * g_dbus_connection_signal_subscribe() is called, in order to avoid memory + * leaks through callbacks queued on the #GMainContext after it’s stopped being + * iterated. + * * Since: 2.26 */ diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index cb671c7a..76876983 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -633,6 +633,9 @@ * to iterate over the elements of a #GHashTable. GHashTableIter * structures are typically allocated on the stack and then initialized * with g_hash_table_iter_init(). + * + * The iteration order of a #GHashTableIter over the keys/values in a hash + * table is not defined. */ @@ -5746,11 +5749,7 @@ * |[<!-- language="C" --> * #define G_SPAWN_ERROR g_spawn_error_quark () * - * GQuark - * g_spawn_error_quark (void) - * { - * return g_quark_from_static_string ("g-spawn-error-quark"); - * } + * G_DEFINE_QUARK (g-spawn-error-quark, g_spawn_error) * ]| * * - The quark function for the error domain is called @@ -6466,7 +6465,9 @@ * * To call a function for each key and value pair use * g_hash_table_foreach() or use an iterator to iterate over the - * key/value pairs in the hash table, see #GHashTableIter. + * key/value pairs in the hash table, see #GHashTableIter. The iteration order + * of a hash table is not defined, and you must not rely on iterating over + * keys/values in the same order as they were inserted. * * To destroy a #GHashTable use g_hash_table_destroy(). * @@ -17352,6 +17353,9 @@ * items). To remove all items matching a predicate, use * g_hash_table_foreach_remove(). * + * The order in which g_hash_table_foreach() iterates over the keys/values in + * the hash table is not defined. + * * See g_hash_table_find() for performance caveats for linear * order searches in contrast to g_hash_table_lookup(). */ @@ -17512,6 +17516,10 @@ * Initializes a key/value pair iterator and associates it with * @hash_table. Modifying the hash table after calling this function * invalidates the returned iterator. + * + * The iteration order of a #GHashTableIter over the keys/values in a hash + * table is not defined. + * * |[<!-- language="C" --> * GHashTableIter iter; * gpointer key, value; |