summaryrefslogtreecommitdiff
path: root/gir/gio-2.0.c
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2017-07-17 12:27:41 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2017-07-17 12:27:41 +0200
commit44aa990e80758ed9ad842fadc19857f26a663105 (patch)
treeb878f79dc03353d487e7cbd358b80f6497a46727 /gir/gio-2.0.c
parentc6fce971dac5bafa8485fe477a37b40c6dde960f (diff)
downloadgobject-introspection-44aa990e80758ed9ad842fadc19857f26a663105.tar.gz
gir: Update annotations from GLib git master
Diffstat (limited to 'gir/gio-2.0.c')
-rw-r--r--gir/gio-2.0.c14
1 files changed, 11 insertions, 3 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