From: Adrien Bustany <abustany@gnome.org>
Date: Wed, 10 Mar 2010 18:07:46 +0000 (-0300)
Subject: rest bindings: Mark nullable parameters as such
X-Git-Tag: 0.8.0~216
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1380dd88f292b96d8bc518136714636d8ec8a2d;p=thirdparty%2Fvala.git

rest bindings: Mark nullable parameters as such

This commit marks the weak_object parameter of RestProxyCallAsyncCallback and
OAuthProxyCallAuthCallback as nullable
---

diff --git a/vapi/packages/rest/rest.metadata b/vapi/packages/rest/rest.metadata
index 00a3a86d7..3eac20f3c 100644
--- a/vapi/packages/rest/rest.metadata
+++ b/vapi/packages/rest/rest.metadata
@@ -22,6 +22,8 @@ rest_proxy_call_async name="run_async"
 rest_proxy_call_async.userdata hidden="1"
 RestProxyCallAsyncCallback.userdata hidden="1"
 RestProxyCallAsyncCallback.error nullable="1"
+RestProxyCallAsyncCallback.weak_object nullable="1"
 OAuthProxyAuthCallback.userdata hidden="1"
 OAuthProxyAuthCallback.error nullable="1"
+OAuthProxyAuthCallback.weak_object nullable="1"
 
diff --git a/vapi/rest.vapi b/vapi/rest.vapi
index b8e522d0d..a8dfaa660 100644
--- a/vapi/rest.vapi
+++ b/vapi/rest.vapi
@@ -153,7 +153,7 @@ namespace Rest {
 		public XmlParser ();
 		public unowned Rest.XmlNode parse_from_data (string data, int64 len);
 	}
-	[CCode (cprefix = "", has_type_id = "0", cheader_filename = "rest/oauth-proxy.h")]
+	[CCode (cprefix = "", has_type_id = false, cheader_filename = "rest/oauth-proxy.h")]
 	public enum OAuthSignatureMethod {
 		PLAINTEXT,
 		HMAC_SHA1
@@ -203,8 +203,8 @@ namespace Rest {
 		HTTP_GATEWAY_TIMEOUT,
 		HTTP_HTTP_VERSION_NOT_SUPPORTED,
 	}
-	[CCode (cheader_filename = "rest/oauth-proxy.h")]
-	public delegate void OAuthProxyAuthCallback (Rest.OAuthProxy proxy, GLib.Error error, GLib.Object weak_object);
-	[CCode (cheader_filename = "rest/rest-proxy-call.h")]
-	public delegate void ProxyCallAsyncCallback (Rest.ProxyCall call, GLib.Error error, GLib.Object weak_object);
+	[CCode (cheader_filename = "rest/oauth-proxy.h", instance_pos = -2)]
+	public delegate void OAuthProxyAuthCallback (Rest.OAuthProxy proxy, GLib.Error? error, GLib.Object? weak_object);
+	[CCode (cheader_filename = "rest/rest-proxy-call.h", instance_pos = -2)]
+	public delegate void ProxyCallAsyncCallback (Rest.ProxyCall call, GLib.Error? error, GLib.Object? weak_object);
 }