diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-03-05 19:55:19 +0100 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-03-05 19:55:19 +0100 |
commit | e2f5c88d2d0379be30cb908c233d280ed9c6f43d (patch) | |
tree | b9449fe0509b3d7bb6fe890b63b12b82685448eb | |
parent | 5300bd4869a9e5344908d8682b039a82c3489c2d (diff) | |
download | gobject-introspection-e2f5c88d2d0379be30cb908c233d280ed9c6f43d.tar.gz |
gir: Update annotations from GLib git master
-rw-r--r-- | gir/gio-2.0.c | 3 | ||||
-rw-r--r-- | gir/glib-2.0.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 10a2f672..56651de4 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -37832,6 +37832,9 @@ * As an alternative, you can use g_subprocess_launcher_setenv(), * g_subprocess_launcher_unsetenv(), etc. * + * Pass %NULL to inherit the parent process' environment. Pass an + * empty array to set an empty environment. + * * On UNIX, all strings in this array can be arbitrary byte strings. * On Windows, they should be in UTF-8. * diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 9a35f49d..c9000209 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -6638,7 +6638,7 @@ * Both the key and data are arbitrary byte arrays of bytes or characters. * * Support for HMAC Digests has been added in GLib 2.30, and support for SHA-512 - * in GLib 2.42. + * in GLib 2.42. Support for SHA-384 was added in GLib 2.52. */ @@ -16560,6 +16560,7 @@ * on it anymore. * * Support for digests of type %G_CHECKSUM_SHA512 has been added in GLib 2.42. + * Support for %G_CHECKSUM_SHA384 was added in GLib 2.52. * * Returns: the newly created #GHmac, or %NULL. * Use g_hmac_unref() to free the memory allocated by it. @@ -30121,7 +30122,7 @@ * * This function enqueus a callback @destroy_func to be executed * during the next test case teardown phase. This is most useful - * to auto destruct allocted test resources at the end of a test run. + * to auto destruct allocated test resources at the end of a test run. * Resources are released in reverse queue order, that means enqueueing * callback A before callback B will cause B() to be called before * A() during teardown. @@ -33243,6 +33244,8 @@ /** * g_utf8_make_valid: * @str: string to coerce into UTF-8 + * @len: the maximum length of @str to use, in bytes. If @len < 0, + * then the string is nul-terminated. * * If the provided string is valid UTF-8, return a copy of it. If not, * return a copy in which bytes that could not be interpreted as valid Unicode |