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 e0ff1cacc3255e0b5bbb603da50b58d940ea4a1a..00a3a86d72fc0c030d5df4439a43a4775aaa1015 100644 (file)
--- 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 ad7cb5e391c21eae7a0ec97a0f3b93b17b168ba9..0bb8129217de7caa577982b47f8511049735192b 100644 (file)
--- 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);