From: Alexander Kurtz <kurtz.alex@googlemail.com>
Date: Thu, 2 Feb 2012 13:26:04 +0000 (+0100)
Subject: glib-2.0: AsyncQueue.try_pop() and timed_pop() may return null
X-Git-Tag: 0.15.2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=206ab85db95d4ef22c861dca3be2e0a325ef4bb1;p=thirdparty%2Fvala.git

glib-2.0: AsyncQueue.try_pop() and timed_pop() may return null

Fixes bug 669242.
---

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index a428bb1df..9cd49a083 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -1968,8 +1968,8 @@ namespace GLib {
 		public void push (owned G data);
 		public void push_sorted (owned G data, CompareDataFunc<G> func);
 		public G pop ();
-		public G try_pop ();
-		public G timed_pop (ref TimeVal end_time);
+		public G? try_pop ();
+		public G? timed_pop (ref TimeVal end_time);
 		public int length ();
 		public void sort (CompareDataFunc<G> func);
 		public void @lock ();
@@ -1979,8 +1979,8 @@ namespace GLib {
 		public void push_unlocked (owned G data);
 		public void push_sorted_unlocked (owned G data, CompareDataFunc<G> func);
 		public G pop_unlocked ();
-		public G try_pop_unlocked ();
-		public G timed_pop_unlocked (ref TimeVal end_time);
+		public G? try_pop_unlocked ();
+		public G? timed_pop_unlocked (ref TimeVal end_time);
 		public int length_unlocked ();
 		public void sort_unlocked (CompareDataFunc<G> func);
 	}