From: Adrien Bustany <madcat@mymadcat.com>
Date: Fri, 13 Nov 2009 15:45:42 +0000 (-0300)
Subject: rest: Convert ProxyError and ProxyCallError to errordomain.
X-Git-Tag: 0.7.9~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a961b9ee1823356c71d57aae740fad01bac2796;p=thirdparty%2Fvala.git

rest: Convert ProxyError and ProxyCallError to errordomain.

Fixes bug 601737.
---

diff --git a/vapi/packages/rest/rest.metadata b/vapi/packages/rest/rest.metadata
index e0ff1cacc..00a3a86d7 100644
--- a/vapi/packages/rest/rest.metadata
+++ b/vapi/packages/rest/rest.metadata
@@ -8,8 +8,8 @@ RestProxy cheader_filename="rest/rest-proxy.h"
 RestProxyCall cheader_filename="rest/rest-proxy-call.h"
 RestXml* cheader_filename="rest/rest-xml-parser.h"
 OAuthSignatureMethod cheader_filename="rest/oauth-proxy.h"
-RestProxyCallError RestProxyCall cheader_filename="rest/rest-proxy-call.h"
-RestProxyError cheader_filename="rest/rest-proxy.h"
+RestProxyCallError RestProxyCall cheader_filename="rest/rest-proxy-call.h" errordomain="1"
+RestProxyError cheader_filename="rest/rest-proxy.h" errordomain="1"
 OAuthProxyAuthCallback cheader_filename="rest/oauth-proxy.h" has_target="1"
 RestProxyCallAsyncCallback cheader_filename="rest/rest-proxy-call.h" has_target="1"
 
diff --git a/vapi/rest.vapi b/vapi/rest.vapi
index ad7cb5e39..0bb812921 100644
--- a/vapi/rest.vapi
+++ b/vapi/rest.vapi
@@ -92,7 +92,6 @@ namespace Rest {
 		public virtual bool bind_valist (void* @params);
 		public static GLib.Quark error_quark ();
 		public unowned string get_user_agent ();
-		public virtual Rest.ProxyCall new_call ();
 		public void set_user_agent (string user_agent);
 		public bool simple_run (string payload, int64 len) throws GLib.Error;
 		public virtual bool simple_run_valist (string payload, int64 len, void* @params) throws GLib.Error;
@@ -158,12 +157,12 @@ namespace Rest {
 		PLAINTEXT,
 		HMAC_SHA1
 	}
-	[CCode (cprefix = "REST_PROXY_CALL_", has_type_id = "0", cheader_filename = "rest/rest-proxy-call.h")]
-	public enum ProxyCallError {
-		FAILED
+	[CCode (cprefix = "REST_PROXY_CALL_", cheader_filename = "rest/rest-proxy-call.h")]
+	public errordomain ProxyCallError {
+		FAILED,
 	}
-	[CCode (cprefix = "REST_PROXY_ERROR_", has_type_id = "0", cheader_filename = "rest/rest-proxy.h")]
-	public enum ProxyError {
+	[CCode (cprefix = "REST_PROXY_ERROR_", cheader_filename = "rest/rest-proxy.h")]
+	public errordomain ProxyError {
 		CANCELLED,
 		RESOLUTION,
 		CONNECTION,
@@ -201,7 +200,7 @@ namespace Rest {
 		HTTP_BAD_GATEWAY,
 		HTTP_SERVICE_UNAVAILABLE,
 		HTTP_GATEWAY_TIMEOUT,
-		HTTP_HTTP_VERSION_NOT_SUPPORTED
+		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);