From 867f9bfcf53cccd8177825729a924e54ccb64ab1 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Fri, 16 Feb 2018 07:40:16 +0100 Subject: gir: Update annotations from GLib git master --- gir/gio-2.0.c | 22 ++++++++++++---------- gir/glib-2.0.c | 24 ++++++++++++++++++------ gir/gobject-2.0.c | 2 ++ 3 files changed, 32 insertions(+), 16 deletions(-) (limited to 'gir') diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 365cd2a2..11b07ce3 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -7974,7 +7974,7 @@ * that describes the keys in your settings and their types and default * values, as well as some other information. * - * Normally, a schema has as fixed path that determines where the settings + * Normally, a schema has a fixed path that determines where the settings * are stored in the conceptual global tree of settings. However, schemas * can also be '[relocatable][gsettings-relocatable]', i.e. not equipped with * a fixed path. This is @@ -17125,7 +17125,9 @@ * * If the parameters GVariant is floating, it is consumed. * - * This can only fail if @parameters is not compatible with the D-Bus protocol. + * This can only fail if @parameters is not compatible with the D-Bus protocol + * (%G_IO_ERROR_INVALID_ARGUMENT), or if @connection has been closed + * (%G_IO_ERROR_CLOSED). * * Returns: %TRUE unless @error is set * Since: 2.26 @@ -37980,8 +37982,8 @@ * @subprocess: a #GSubprocess * @stdin_buf: (nullable): data to send to the stdin of the subprocess, or %NULL * @cancellable: a #GCancellable - * @stdout_buf: (out): data read from the subprocess stdout - * @stderr_buf: (out): data read from the subprocess stderr + * @stdout_buf: (out) (nullable) (optional) (transfer full): data read from the subprocess stdout + * @stderr_buf: (out) (nullable) (optional) (transfer full): data read from the subprocess stderr * @error: a pointer to a %NULL #GError pointer, or %NULL * * Communicate with the subprocess until it terminates, and all input @@ -38048,8 +38050,8 @@ * g_subprocess_communicate_finish: * @subprocess: Self * @result: Result - * @stdout_buf: (out): Return location for stdout data - * @stderr_buf: (out): Return location for stderr data + * @stdout_buf: (out) (nullable) (optional) (transfer full): Return location for stdout data + * @stderr_buf: (out) (nullable) (optional) (transfer full): Return location for stderr data * @error: Error * * Complete an invocation of g_subprocess_communicate_async(). @@ -38061,8 +38063,8 @@ * @subprocess: a #GSubprocess * @stdin_buf: (nullable): data to send to the stdin of the subprocess, or %NULL * @cancellable: a #GCancellable - * @stdout_buf: (out): data read from the subprocess stdout - * @stderr_buf: (out): data read from the subprocess stderr + * @stdout_buf: (out) (nullable) (optional) (transfer full): data read from the subprocess stdout + * @stderr_buf: (out) (nullable) (optional) (transfer full): data read from the subprocess stderr * @error: a pointer to a %NULL #GError pointer, or %NULL * * Like g_subprocess_communicate(), but validates the output of the @@ -38087,8 +38089,8 @@ * g_subprocess_communicate_utf8_finish: * @subprocess: Self * @result: Result - * @stdout_buf: (out): Return location for stdout data - * @stderr_buf: (out): Return location for stderr data + * @stdout_buf: (out) (nullable) (optional) (transfer full): Return location for stdout data + * @stderr_buf: (out) (nullable) (optional) (transfer full): Return location for stderr data * @error: Error * * Complete an invocation of g_subprocess_communicate_utf8_async(). diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 01f1c051..98c2f02e 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -12844,7 +12844,7 @@ * less than @len if there were partial characters * at the end of the input. If the error * #G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value - * stored will the byte offset after the last valid + * stored will be the byte offset after the last valid * input sequence. * @bytes_written: (out) (optional): the number of bytes stored in * the output buffer (not including the terminating nul). @@ -12938,7 +12938,7 @@ * less than @len if there were partial characters * at the end of the input. If the error * #G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value - * stored will the byte offset after the last valid + * stored will be the byte offset after the last valid * input sequence. * @bytes_written: (out) (optional): the number of bytes stored in * the output buffer (not including the terminating nul). @@ -15708,7 +15708,7 @@ * less than @len if there were partial characters * at the end of the input. If the error * %G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value - * stored will the byte offset after the last valid + * stored will be the byte offset after the last valid * input sequence. * @bytes_written: (out) (optional): the number of bytes stored in * the output buffer (not including the terminating nul). @@ -15761,7 +15761,7 @@ * less than @len if there were partial characters * at the end of the input. If the error * %G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value - * stored will the byte offset after the last valid + * stored will be the byte offset after the last valid * input sequence. * @bytes_written: (out) (optional): the number of bytes stored in the output * buffer (not including the terminating nul). @@ -16504,6 +16504,10 @@ * corresponding value it is able to be stored more efficiently. See * the discussion in the section description. * + * Starting from GLib 2.40, this function returns a boolean value to + * indicate whether the newly added value was already in the hash table + * or not. + * * Returns: %TRUE if the key did not exist yet * Since: 2.32 */ @@ -16707,6 +16711,10 @@ * @key_destroy_func when creating the #GHashTable, the passed * key is freed using that function. * + * Starting from GLib 2.40, this function returns a boolean value to + * indicate whether the newly added value was already in the hash table + * or not. + * * Returns: %TRUE if the key did not exist yet */ @@ -16962,6 +16970,10 @@ * If you supplied a @key_destroy_func when creating the * #GHashTable, the old key is freed using that function. * + * Starting from GLib 2.40, this function returns a boolean value to + * indicate whether the newly added value was already in the hash table + * or not. + * * Returns: %TRUE if the key did not exist yet */ @@ -19875,7 +19887,7 @@ * less than @len if there were partial characters * at the end of the input. If the error * %G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value - * stored will the byte offset after the last valid + * stored will be the byte offset after the last valid * input sequence. * @bytes_written: (out) (optional): the number of bytes stored in the output * buffer (not including the terminating nul). @@ -19913,7 +19925,7 @@ * less than @len if there were partial characters * at the end of the input. If the error * %G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value - * stored will the byte offset after the last valid + * stored will be the byte offset after the last valid * input sequence. * @bytes_written: (out) (optional): the number of bytes stored in the output * buffer (not including the terminating nul). diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index b0688076..4e964e01 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -2948,6 +2948,8 @@ * #GTypeInfo.) It must not be called after after @class_init has * been called for any object types implementing this interface. * + * If @pspec is a floating reference, it will be consumed. + * * Since: 2.4 */ -- cgit v1.2.1