From ba5f94ec8c70699792ee573962c794904510298c Mon Sep 17 00:00:00 2001
From: Martin Pitt <martinpitt@gnome.org>
Date: Thu, 25 Oct 2012 07:59:31 +0200
Subject: [PATCH] Update annotations from glib git

---
 gir/gio-2.0.c  | 10 +++++-----
 gir/glib-2.0.c | 35 +++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index a3eb8b10..d037c548 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -13023,7 +13023,7 @@
  *
  * Looks up the value of an annotation.
  *
- * This cost of this function is O(n) in number of annotations.
+ * The cost of this function is O(n) in number of annotations.
  *
  * Returns: The value or %NULL if not found. Do not free, it is owned by @annotations.
  * Since: 2.26
@@ -14573,7 +14573,7 @@
  *
  * Looks up information about a method.
  *
- * This cost of this function is O(n) in number of methods unless
+ * The cost of this function is O(n) in number of methods unless
  * g_dbus_interface_info_cache_build() has been used on @info.
  *
  * Returns: (transfer none): A #GDBusMethodInfo or %NULL if not found. Do not free, it is owned by @info.
@@ -14588,7 +14588,7 @@
  *
  * Looks up information about a property.
  *
- * This cost of this function is O(n) in number of properties unless
+ * The cost of this function is O(n) in number of properties unless
  * g_dbus_interface_info_cache_build() has been used on @info.
  *
  * Returns: (transfer none): A #GDBusPropertyInfo or %NULL if not found. Do not free, it is owned by @info.
@@ -14603,7 +14603,7 @@
  *
  * Looks up information about a signal.
  *
- * This cost of this function is O(n) in number of signals unless
+ * The cost of this function is O(n) in number of signals unless
  * g_dbus_interface_info_cache_build() has been used on @info.
  *
  * Returns: (transfer none): A #GDBusSignalInfo or %NULL if not found. Do not free, it is owned by @info.
@@ -15833,7 +15833,7 @@
  *
  * Looks up information about an interface.
  *
- * This cost of this function is O(n) in number of interfaces.
+ * The cost of this function is O(n) in number of interfaces.
  *
  * Returns: (transfer none): A #GDBusInterfaceInfo or %NULL if not found. Do not free, it is owned by @info.
  * Since: 2.26
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 85399cac..582acbcd 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -16386,7 +16386,7 @@
 /**
  * g_io_channel_set_encoding:
  * @channel: a #GIOChannel
- * @encoding: the encoding type
+ * @encoding: (allow-none): the encoding type
  * @error: location to store an error of type #GConvertError
  *
  * Sets the encoding for the input/output of the channel.
@@ -16452,7 +16452,7 @@
 /**
  * g_io_channel_set_line_term:
  * @channel: a #GIOChannel
- * @line_term: The line termination string. Use %NULL for autodetect. Autodetection breaks on "\n", "\r\n", "\r", "\0", and the Unicode paragraph separator. Autodetection should not be used for anything other than file-based channels.
+ * @line_term: (allow-none): The line termination string. Use %NULL for autodetect.  Autodetection breaks on "\n", "\r\n", "\r", "\0", and the Unicode paragraph separator. Autodetection should not be used for anything other than file-based channels.
  * @length: The length of the termination string. If -1 is passed, the string is assumed to be nul-terminated. This option allows termination strings with embedded nuls.
  *
  * This sets the string that #GIOChannel uses to determine
@@ -31001,6 +31001,20 @@
  */
 
 
+/**
+ * g_variant_get_data_as_bytes:
+ * @value: a #GVariant
+ *
+ * Returns a pointer to the serialised form of a #GVariant instance.
+ * The semantics of this function are exactly the same as
+ * g_variant_get_data(), except that the returned #GBytes holds
+ * a reference to the variant data.
+ *
+ * Returns: (transfer full): A new #GBytes representing the variant data
+ * Since: 2.36
+ */
+
+
 /**
  * g_variant_get_double:
  * @value: a double #GVariant instance
@@ -31974,6 +31988,23 @@
  */
 
 
+/**
+ * g_variant_new_from_bytes:
+ * @type: a #GVariantType
+ * @bytes: a #GBytes
+ * @trusted: if the contents of @bytes are trusted
+ *
+ * Constructs a new serialised-mode #GVariant instance.  This is the
+ * inner interface for creation of new serialised values that gets
+ * called from various functions in gvariant.c.
+ *
+ * A reference is taken on @bytes.
+ *
+ * Returns: a new #GVariant with a floating reference
+ * Since: 2.36
+ */
+
+
 /**
  * g_variant_new_from_data:
  * @type: a definite #GVariantType
-- 
2.34.1