gir: Update annotations from GLib git master

2 files changed, 26 insertions, 8 deletions

diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index e3633082..c2eb3d95 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -18110,7 +18110,11 @@
  * Converts a #GVariant to a #GValue. If @value is floating, it is consumed.
  *
  * The rules specified in the g_dbus_gvalue_to_gvariant() function are
- * used - this function is essentially its reverse form.
+ * used - this function is essentially its reverse form. So, a #GVariant
+ * containing any basic or string array type will be converted to a #GValue
+ * containing a basic value or string array. Any other #GVariant (handle,
+ * variant, tuple, dict entry) will be converted to a #GValue containing that
+ * #GVariant.
  *
  * The conversion never fails - a valid #GValue is always returned in
  * @out_gvalue.
@@ -22424,6 +22428,10 @@
  * will be copied as symlinks, otherwise the target of the
  * @source symlink will be copied.
  *
+ * If the flag #G_FILE_COPY_ALL_METADATA is specified then all the metadata
+ * that is possible to copy is copied, not just the default subset (which,
+ * for instance, does not include the owner, see #GFileInfo).
+ *
  * If @cancellable is not %NULL, then the operation can be cancelled by
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
@@ -32570,8 +32578,8 @@
  * @lookup_flags: A #GResourceLookupFlags
  * @size: (out) (optional): a location to place the length of the contents of the file,
  *    or %NULL if the length is not needed
- * @flags: (out) (optional): a location to place the flags about the file,
- *    or %NULL if the length is not needed
+ * @flags: (out) (optional): a location to place the #GResourceFlags about the file,
+ *    or %NULL if the flags are not needed
  * @error: return location for a #GError, or %NULL
  *
  * Looks for a file at the specified @path in the set of
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index d0bd5481..21bb4957 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -6404,7 +6404,7 @@
  *
  * To put the entire example together, for our dictionary mapping
  * strings to variants (with two entries, as given above), we are
- * using 91 bytes of memory for type information, 29 byes of memory
+ * using 91 bytes of memory for type information, 29 bytes of memory
  * for the serialised data, 16 bytes for buffer management and 24
  * bytes for the #GVariant instance, or a total of 160 bytes, plus
  * malloc overhead.  If we were to use g_variant_get_child_value() to
@@ -18154,7 +18154,7 @@
  * The array of returned groups will be %NULL-terminated, so
  * @length may optionally be %NULL.
  *
- * Returns: (array zero-terminated=1) (transfer full): a newly-allocated %NULL-terminated array of strings.
+ * Returns: (array zero-terminated=1 length=length) (transfer full): a newly-allocated %NULL-terminated array of strings.
  *   Use g_strfreev() to free it.
  * Since: 2.6
  */
@@ -18237,7 +18237,7 @@
  * be found, %NULL is returned and @error is set to
  * #G_KEY_FILE_ERROR_GROUP_NOT_FOUND.
  *
- * Returns: (array zero-terminated=1) (transfer full): a newly-allocated %NULL-terminated array of strings.
+ * Returns: (array zero-terminated=1 length=length) (transfer full): a newly-allocated %NULL-terminated array of strings.
  *     Use g_strfreev() to free it.
  * Since: 2.6
  */
@@ -18851,7 +18851,7 @@
  * Note that this function never reports an error,
  * so it is safe to pass %NULL as @error.
  *
- * Returns: a newly allocated string holding
+ * Returns: (array length=length): a newly allocated string holding
  *   the contents of the #GKeyFile
  * Since: 2.6
  */
@@ -33382,7 +33382,13 @@
  * is made to see if the character found is actually valid other than
  * it starts with an appropriate byte.
  *
- * Returns: a pointer to the found character or %NULL
+ * If @end is %NULL, the return value will never be %NULL: if the end of the
+ * string is reached, a pointer to the terminating nul byte is returned. If
+ * @end is non-%NULL, the return value will be %NULL if the end of the string
+ * is reached.
+ *
+ * Returns: (nullable): a pointer to the found character or %NULL if @end is
+ *    set and is reached
  */
 
 
@@ -33428,6 +33434,10 @@
  * such as characters that are out of the range of Unicode, and for
  * overlong encodings of valid characters.
  *
+ * Note that g_utf8_get_char_validated() returns (gunichar)-2 if
+ * @max_len is positive and any of the bytes in the first UTF-8 character
+ * sequence are nul.
+ *
  * Returns: the resulting character. If @p points to a partial
  *     sequence at the end of a string that could begin a valid
  *     character (or if @max_len is zero), returns (gunichar)-2;