summaryrefslogtreecommitdiff
path: root/gir/glib-2.0.c
diff options
context:
space:
mode:
authorGiovanni Campagna <gcampagna@src.gnome.org>2012-02-14 19:11:15 +0100
committerGiovanni Campagna <gcampagna@src.gnome.org>2012-02-14 19:11:23 +0100
commit29a790c19bbe06f4b70eaa9e0f600f145683c05b (patch)
treec731f74d665cb047cc6179d1e972dcc97fb67624 /gir/glib-2.0.c
parent3042d49de04a4c8ad514cdf098630311f1b28256 (diff)
downloadgobject-introspection-29a790c19bbe06f4b70eaa9e0f600f145683c05b.tar.gz
Update glib annotations
Updated to glib 2.31.16-56-gd240b88, which includes one change to GKeyFile.
Diffstat (limited to 'gir/glib-2.0.c')
-rw-r--r--gir/glib-2.0.c42
1 files changed, 39 insertions, 3 deletions
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 2343c2dc..2c5d7fee 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -9798,7 +9798,7 @@
* available in the queue at that point, the thread is now put to sleep
* until a message arrives. The message will be removed from the queue
* and returned. The functions g_async_queue_try_pop() and
- * g_async_queue_timed_pop() can be used to only check for the presence
+ * g_async_queue_timeout_pop() can be used to only check for the presence
* of messages or to only wait a certain time for messages respectively.
*
* For almost every function there exist two variants, one that locks
@@ -14190,6 +14190,7 @@
* received before @end_time.
*
* Returns: data from the queue or %NULL, when no data is
+ * Deprecated: use g_async_queue_timeout_pop().
*/
@@ -14211,6 +14212,41 @@
* received before @end_time.
*
* Returns: data from the queue or %NULL, when no data is
+ * Deprecated: use g_async_queue_timeout_pop_unlocked().
+ */
+
+
+/**
+ * g_async_queue_timeout_pop:
+ * @queue: a #GAsyncQueue
+ * @timeout: the number of microseconds to wait
+ *
+ * Pops data from the @queue. If the queue is empty, blocks for
+ * @timeout microseconds, or until data becomes available.
+ *
+ * If no data is received before the timeout, %NULL is returned.
+ *
+ * received before the timeout.
+ *
+ * Returns: data from the queue or %NULL, when no data is
+ */
+
+
+/**
+ * g_async_queue_timeout_pop_unlocked:
+ * @queue: a #GAsyncQueue
+ * @time: the number of microseconds to wait
+ *
+ * Pops data from the @queue. If the queue is empty, blocks for
+ * @timeout microseconds, or until data becomes available.
+ *
+ * If no data is received before the timeout, %NULL is returned.
+ *
+ * This function must be called while holding the @queue's lock.
+ *
+ * received before the timeout.
+ *
+ * Returns: data from the queue or %NULL, when no data is
*/
@@ -22261,8 +22297,8 @@
/**
* g_key_file_load_from_data:
* @key_file: an empty #GKeyFile struct
- * @data: (array length=length): key file loaded in memory
- * @length: the length of @data in bytes
+ * @data: key file loaded in memory
+ * @length: the length of @data in bytes (or -1 if data is nul-terminated)
* @flags: flags from #GKeyFileFlags
* @error: return location for a #GError, or %NULL
*