From cbd238445f23eff22e61d2f973c45339f089a4d8 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 8 Feb 2016 13:44:12 +0100
Subject: gir: Update annotations from GLib git master

---
 gir/gio-2.0.c     | 4 ++--
 gir/glib-2.0.c    | 2 +-
 gir/gobject-2.0.c | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 8b6a7e92..9692f5d6 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -15926,7 +15926,7 @@
 /**
  * g_dbus_address_get_stream_finish:
  * @res: A #GAsyncResult obtained from the GAsyncReadyCallback passed to g_dbus_address_get_stream().
- * @out_guid: %NULL or return location to store the GUID extracted from @address, if any.
+ * @out_guid: (optional) (out): %NULL or return location to store the GUID extracted from @address, if any.
  * @error: Return location for error or %NULL.
  *
  * Finishes an operation started with g_dbus_address_get_stream().
@@ -15939,7 +15939,7 @@
 /**
  * g_dbus_address_get_stream_sync:
  * @address: A valid D-Bus address.
- * @out_guid: %NULL or return location to store the GUID extracted from @address, if any.
+ * @out_guid: (optional) (out): %NULL or return location to store the GUID extracted from @address, if any.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 68a35baf..c6ad5b8c 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -12514,7 +12514,7 @@
  * @oldval: (allow-none): the old value to compare against
  * @newval: (allow-none): the new value to replace it with
  * @destroy: (allow-none): destroy notify for the new value
- * @old_destroy: (allow-none): destroy notify for the existing value
+ * @old_destroy: (optional) (out): destroy notify for the existing value
  *
  * Compares the member that is associated with @key_id in
  * @datalist to @oldval, and if they are the same, replace
diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c
index 9ed01cdf..741928e4 100644
--- a/gir/gobject-2.0.c
+++ b/gir/gobject-2.0.c
@@ -1947,7 +1947,7 @@
 /**
  * g_closure_invoke:
  * @closure: a #GClosure
- * @return_value: (allow-none): a #GValue to store the return
+ * @return_value: (optional) (out): a #GValue to store the return
  *                value. May be %NULL if the callback of @closure
  *                doesn't return a value.
  * @n_param_values: the length of the @param_values array
@@ -3141,7 +3141,7 @@
  * @oldval: (allow-none): the old value to compare against
  * @newval: (allow-none): the new value
  * @destroy: (allow-none): a destroy notify for the new value
- * @old_destroy: (allow-none): destroy notify for the existing value
+ * @old_destroy: (optional) (out): destroy notify for the existing value
  *
  * Compares the user data for the key @quark on @object with
  * @oldval, and if they are the same, replaces @oldval with
@@ -4633,7 +4633,7 @@
  * created. Further information about the signals can be acquired through
  * g_signal_query().
  *
- * Returns: (array length=n_ids): Newly allocated array of signal IDs.
+ * Returns: (array length=n_ids) (transfer full): Newly allocated array of signal IDs.
  */
 
 
@@ -6799,7 +6799,7 @@
 /**
  * g_value_take_variant:
  * @value: a valid #GValue of type %G_TYPE_VARIANT
- * @variant: (allow-none): a #GVariant, or %NULL
+ * @variant: (nullable) (transfer full): a #GVariant, or %NULL
  *
  * Set the contents of a variant #GValue to @variant, and takes over
  * the ownership of the caller's reference to @variant;
-- 
cgit v1.2.1