From 1a4de48da8e9c20d99b8136c31c8ae6cd17c6ebc Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 15 Nov 2014 14:28:29 +0100
Subject: Update glib annotations from git master

---
 gir/gio-2.0.c  | 18 ++++++++++--------
 gir/glib-2.0.c | 16 ++++++++++------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 9324c367..076ad488 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -13308,6 +13308,8 @@
  * For convenience, you can call this with a %NULL #GCancellable,
  * in which case the source will never trigger.
  *
+ * The new #GSource will hold a reference to the #GCancellable.
+ *
  * Returns: (transfer full): the new #GSource.
  * Since: 2.28
  */
@@ -22795,14 +22797,14 @@
  * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
  * returned.
  *
- * If you pass in a non-%NULL @etag value, then this value is
- * compared to the current entity tag of the file, and if they differ
- * an %G_IO_ERROR_WRONG_ETAG error is returned. This generally means
- * that the file has been changed since you last read it. You can get
- * the new etag from g_file_output_stream_get_etag() after you've
- * finished writing and closed the #GFileOutputStream. When you load
- * a new file you can use g_file_input_stream_query_info() to get
- * the etag of the file.
+ * If you pass in a non-%NULL @etag value and @file already exists, then
+ * this value is compared to the current entity tag of the file, and if
+ * they differ an %G_IO_ERROR_WRONG_ETAG error is returned. This
+ * generally means that the file has been changed since you last read
+ * it. You can get the new etag from g_file_output_stream_get_etag()
+ * after you've finished writing and closed the #GFileOutputStream. When
+ * you load a new file you can use g_file_input_stream_query_info() to
+ * get the etag of the file.
  *
  * If @make_backup is %TRUE, this function will attempt to make a
  * backup of the current file before overwriting it. If this fails
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index b8e24ec9..287f39d3 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -6886,7 +6886,7 @@
  * This also means that there is no need to check if the call succeeded.
  *
  * It's important to match g_malloc() (and wrappers such as g_new()) with
- * g_free(), g_slice_alloc() and wrappers such as g_slice_new()) with
+ * g_free(), g_slice_alloc() (and wrappers such as g_slice_new()) with
  * g_slice_free(), plain malloc() with free(), and (if you're using C++)
  * new with delete and new[] with delete[]. Otherwise bad things can happen,
  * since these allocators may use different memory pools (and new/delete call
@@ -22476,12 +22476,14 @@
 /**
  * g_queue_insert_after:
  * @queue: a #GQueue
- * @sibling: a #GList link that must be part of @queue
+ * @sibling: (nullable): a #GList link that must be part of @queue, or %NULL to
+ *   push at the head of the queue.
  * @data: the data to insert
  *
- * Inserts @data into @queue after @sibling
+ * Inserts @data into @queue after @sibling.
  *
- * @sibling must be part of @queue
+ * @sibling must be part of @queue. Since GLib 2.44 a %NULL sibling pushes the
+ * data at the head of the queue.
  *
  * Since: 2.4
  */
@@ -22490,12 +22492,14 @@
 /**
  * g_queue_insert_before:
  * @queue: a #GQueue
- * @sibling: a #GList link that must be part of @queue
+ * @sibling: (nullable): a #GList link that must be part of @queue, or %NULL to
+ *   push at the tail of the queue.
  * @data: the data to insert
  *
  * Inserts @data into @queue before @sibling.
  *
- * @sibling must be part of @queue.
+ * @sibling must be part of @queue. Since GLib 2.44 a %NULL sibling pushes the
+ * data at the tail of the queue.
  *
  * Since: 2.4
  */
-- 
cgit v1.2.1