rest-0.6: Fix multiple issues with the bindings

diff --git a/vapi/packages/rest-0.6/rest-0.6-custom.vala b/vapi/packages/rest-0.6/rest-0.6-custom.vala
index ac95972c20288044c1868b00c7604c5357af2f92..ee8d60d062d455871fc34c3ae76f2751d17e7906 100644 (file)
--- a/vapi/packages/rest-0.6/rest-0.6-custom.vala
+++ b/vapi/packages/rest-0.6/rest-0.6-custom.vala
@@ -1,23 +1,11 @@
 namespace Rest {
        [CCode (cheader_filename = "rest/rest-proxy.h")]
-       public class Proxy : GLib.Object {
+       public class Proxy {
                public Rest.ProxyCall new_call ();
        }
 
-       [CCode (cheader_filename = "rest/rest-proxy-call.h")]
-       public class ProxyCall : GLib.Object {
-       }
-
-       [CCode (cheader_filename = "rest/rest-xml-parser.h")]
-       public class XmlParser : GLib.Object {
-       }
-
-       [CCode (cheader_filename = "rest/oauth-proxy.h")]
-       public class OAuthProxy : Rest.Proxy {
-       }
-
-       [CCode (cheader_filename = "rest/oauth-proxy-call.h")]
-       public class OAuthProxyCall : Rest.ProxyCall {
+       [CCode (cname = "OAuthProxy", cheader_filename = "rest/oauth-proxy.h")]
+       public class OAuthProxy {
        }
 }
 

diff --git a/vapi/packages/rest-0.6/rest-0.6.files b/vapi/packages/rest-0.6/rest-0.6.files
index 1db420b6a545776760bc28edff108148ce0222f5..5d82be854fadc54ff852f2b944e530e8595c521c 100644 (file)
--- a/vapi/packages/rest-0.6/rest-0.6.files
+++ b/vapi/packages/rest-0.6/rest-0.6.files
@@ -1 +1,2 @@
 include/rest-0.6/rest/*.h
+lib/librest-0.6.so

diff --git a/vapi/packages/rest-0.6/rest-0.6.gi b/vapi/packages/rest-0.6/rest-0.6.gi
index fed2554339d638812b2d738460092d2152671622..169c4dab101b52e0553d39540b0ea4fcff842136 100644 (file)
--- a/vapi/packages/rest-0.6/rest-0.6.gi
+++ b/vapi/packages/rest-0.6/rest-0.6.gi
@@ -19,7 +19,94 @@
                                <parameter name="userdata" type="gpointer"/>
                        </parameters>
                </callback>
-               <struct name="OAuthProxy">
+               <boxed name="RestXmlNode" type-name="RestXmlNode" get-type="rest_xml_node_get_type">
+                       <method name="find" symbol="rest_xml_node_find">
+                               <return-type type="RestXmlNode*"/>
+                               <parameters>
+                                       <parameter name="node" type="RestXmlNode*"/>
+                                       <parameter name="tag" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="free" symbol="rest_xml_node_free">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="node" type="RestXmlNode*"/>
+                               </parameters>
+                       </method>
+                       <method name="get_attr" symbol="rest_xml_node_get_attr">
+                               <return-type type="gchar*"/>
+                               <parameters>
+                                       <parameter name="node" type="RestXmlNode*"/>
+                                       <parameter name="attr_name" type="gchar*"/>
+                               </parameters>
+                       </method>
+                       <method name="ref" symbol="rest_xml_node_ref">
+                               <return-type type="RestXmlNode*"/>
+                               <parameters>
+                                       <parameter name="node" type="RestXmlNode*"/>
+                               </parameters>
+                       </method>
+                       <method name="unref" symbol="rest_xml_node_unref">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="node" type="RestXmlNode*"/>
+                               </parameters>
+                       </method>
+                       <field name="ref_count" type="int"/>
+                       <field name="name" type="gchar*"/>
+                       <field name="content" type="gchar*"/>
+                       <field name="children" type="GHashTable*"/>
+                       <field name="attrs" type="GHashTable*"/>
+                       <field name="next" type="RestXmlNode*"/>
+               </boxed>
+               <enum name="OAuthSignatureMethod">
+                       <member name="PLAINTEXT" value="0"/>
+                       <member name="HMAC_SHA1" value="1"/>
+               </enum>
+               <enum name="RestProxyCallError">
+                       <member name="REST_PROXY_CALL_FAILED" value="0"/>
+               </enum>
+               <enum name="RestProxyError">
+                       <member name="REST_PROXY_ERROR_CANCELLED" value="1"/>
+                       <member name="REST_PROXY_ERROR_RESOLUTION" value="2"/>
+                       <member name="REST_PROXY_ERROR_CONNECTION" value="3"/>
+                       <member name="REST_PROXY_ERROR_SSL" value="4"/>
+                       <member name="REST_PROXY_ERROR_IO" value="5"/>
+                       <member name="REST_PROXY_ERROR_FAILED" value="6"/>
+                       <member name="REST_PROXY_ERROR_HTTP_MULTIPLE_CHOICES" value="300"/>
+                       <member name="REST_PROXY_ERROR_HTTP_MOVED_PERMANENTLY" value="301"/>
+                       <member name="REST_PROXY_ERROR_HTTP_FOUND" value="302"/>
+                       <member name="REST_PROXY_ERROR_HTTP_SEE_OTHER" value="303"/>
+                       <member name="REST_PROXY_ERROR_HTTP_NOT_MODIFIED" value="304"/>
+                       <member name="REST_PROXY_ERROR_HTTP_USE_PROXY" value="305"/>
+                       <member name="REST_PROXY_ERROR_HTTP_THREEOHSIX" value="306"/>
+                       <member name="REST_PROXY_ERROR_HTTP_TEMPORARY_REDIRECT" value="307"/>
+                       <member name="REST_PROXY_ERROR_HTTP_BAD_REQUEST" value="400"/>
+                       <member name="REST_PROXY_ERROR_HTTP_UNAUTHORIZED" value="401"/>
+                       <member name="REST_PROXY_ERROR_HTTP_FOUROHTWO" value="402"/>
+                       <member name="REST_PROXY_ERROR_HTTP_FORBIDDEN" value="403"/>
+                       <member name="REST_PROXY_ERROR_HTTP_NOT_FOUND" value="404"/>
+                       <member name="REST_PROXY_ERROR_HTTP_METHOD_NOT_ALLOWED" value="405"/>
+                       <member name="REST_PROXY_ERROR_HTTP_NOT_ACCEPTABLE" value="406"/>
+                       <member name="REST_PROXY_ERROR_HTTP_PROXY_AUTHENTICATION_REQUIRED" value="407"/>
+                       <member name="REST_PROXY_ERROR_HTTP_REQUEST_TIMEOUT" value="408"/>
+                       <member name="REST_PROXY_ERROR_HTTP_CONFLICT" value="409"/>
+                       <member name="REST_PROXY_ERROR_HTTP_GONE" value="410"/>
+                       <member name="REST_PROXY_ERROR_HTTP_LENGTH_REQUIRED" value="411"/>
+                       <member name="REST_PROXY_ERROR_HTTP_PRECONDITION_FAILED" value="412"/>
+                       <member name="REST_PROXY_ERROR_HTTP_REQUEST_ENTITY_TOO_LARGE" value="413"/>
+                       <member name="REST_PROXY_ERROR_HTTP_REQUEST_URI_TOO_LONG" value="414"/>
+                       <member name="REST_PROXY_ERROR_HTTP_UNSUPPORTED_MEDIA_TYPE" value="415"/>
+                       <member name="REST_PROXY_ERROR_HTTP_REQUESTED_RANGE_NOT_SATISFIABLE" value="416"/>
+                       <member name="REST_PROXY_ERROR_HTTP_EXPECTATION_FAILED" value="417"/>
+                       <member name="REST_PROXY_ERROR_HTTP_INTERNAL_SERVER_ERROR" value="500"/>
+                       <member name="REST_PROXY_ERROR_HTTP_NOT_IMPLEMENTED" value="501"/>
+                       <member name="REST_PROXY_ERROR_HTTP_BAD_GATEWAY" value="502"/>
+                       <member name="REST_PROXY_ERROR_HTTP_SERVICE_UNAVAILABLE" value="503"/>
+                       <member name="REST_PROXY_ERROR_HTTP_GATEWAY_TIMEOUT" value="504"/>
+                       <member name="REST_PROXY_ERROR_HTTP_HTTP_VERSION_NOT_SUPPORTED" value="505"/>
+               </enum>
+               <object name="OAuthProxy" parent="RestProxy" type-name="OAuthProxy" get-type="oauth_proxy_get_type">
                        <method name="access_token" symbol="oauth_proxy_access_token">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -78,7 +165,7 @@
                                        <parameter name="proxy" type="OAuthProxy*"/>
                                </parameters>
                        </method>
-                       <method name="new" symbol="oauth_proxy_new">
+                       <constructor name="new" symbol="oauth_proxy_new">
                                <return-type type="RestProxy*"/>
                                <parameters>
                                        <parameter name="consumer_key" type="char*"/>
@@ -86,8 +173,8 @@
                                        <parameter name="url_format" type="gchar*"/>
                                        <parameter name="binding_required" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <method name="new_with_token" symbol="oauth_proxy_new_with_token">
+                       </constructor>
+                       <constructor name="new_with_token" symbol="oauth_proxy_new_with_token">
                                <return-type type="RestProxy*"/>
                                <parameters>
                                        <parameter name="consumer_key" type="char*"/>
@@ -97,7 +184,7 @@
                                        <parameter name="url_format" type="gchar*"/>
                                        <parameter name="binding_required" type="gboolean"/>
                                </parameters>
-                       </method>
+                       </constructor>
                        <method name="request_token" symbol="oauth_proxy_request_token">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -133,20 +220,14 @@
                                        <parameter name="token_secret" type="char*"/>
                                </parameters>
                        </method>
-                       <field name="parent" type="RestProxy"/>
-               </struct>
-               <struct name="OAuthProxyCall">
-                       <field name="parent" type="RestProxyCall"/>
-               </struct>
-               <struct name="OAuthProxyCallClass">
-                       <field name="parent_class" type="RestProxyCallClass"/>
-                       <field name="_padding_dummy" type="gpointer[]"/>
-               </struct>
-               <struct name="OAuthProxyClass">
-                       <field name="parent_class" type="RestProxyClass"/>
-                       <field name="_padding_dummy" type="gpointer[]"/>
-               </struct>
-               <struct name="RestProxy">
+                       <property name="consumer-key" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="consumer-secret" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="token" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="token-secret" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+               </object>
+               <object name="OAuthProxyCall" parent="RestProxyCall" type-name="OAuthProxyCall" get-type="oauth_proxy_call_get_type">
+               </object>
+               <object name="RestProxy" parent="GObject" type-name="RestProxy" get-type="rest_proxy_get_type">
                        <method name="bind" symbol="rest_proxy_bind">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -169,19 +250,19 @@
                                        <parameter name="proxy" type="RestProxy*"/>
                                </parameters>
                        </method>
-                       <method name="new" symbol="rest_proxy_new">
+                       <constructor name="new" symbol="rest_proxy_new">
                                <return-type type="RestProxy*"/>
                                <parameters>
                                        <parameter name="url_format" type="gchar*"/>
                                        <parameter name="binding_required" type="gboolean"/>
                                </parameters>
-                       </method>
-                       <method name="new_call" symbol="rest_proxy_new_call">
+                       </constructor>
+                       <constructor name="new_call" symbol="rest_proxy_new_call">
                                <return-type type="RestProxyCall*"/>
                                <parameters>
                                        <parameter name="proxy" type="RestProxy*"/>
                                </parameters>
-                       </method>
+                       </constructor>
                        <method name="set_user_agent" symbol="rest_proxy_set_user_agent">
                                <return-type type="void"/>
                                <parameters>
@@ -208,9 +289,34 @@
                                        <parameter name="params" type="va_list"/>
                                </parameters>
                        </method>
-                       <field name="parent" type="GObject"/>
-               </struct>
-               <struct name="RestProxyCall">
+                       <property name="binding-required" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="url-format" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="user-agent" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <vfunc name="bind_valist">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="proxy" type="RestProxy*"/>
+                                       <parameter name="params" type="va_list"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="new_call">
+                               <return-type type="RestProxyCall*"/>
+                               <parameters>
+                                       <parameter name="proxy" type="RestProxy*"/>
+                               </parameters>
+                       </vfunc>
+                       <vfunc name="simple_run_valist">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="proxy" type="RestProxy*"/>
+                                       <parameter name="payload" type="gchar**"/>
+                                       <parameter name="len" type="goffset*"/>
+                                       <parameter name="error" type="GError**"/>
+                                       <parameter name="params" type="va_list"/>
+                               </parameters>
+                       </vfunc>
+               </object>
+               <object name="RestProxyCall" parent="GObject" type-name="RestProxyCall" get-type="rest_proxy_call_get_type">
                        <method name="add_header" symbol="rest_proxy_call_add_header">
                                <return-type type="void"/>
                                <parameters>
@@ -378,65 +484,19 @@
                                        <parameter name="error_out" type="GError**"/>
                                </parameters>
                        </method>
-                       <field name="parent" type="GObject"/>
-                       <field name="priv" type="RestProxyCallPrivate*"/>
-               </struct>
-               <struct name="RestProxyCallClass">
-                       <field name="parent_class" type="GObjectClass"/>
-                       <field name="prepare" type="GCallback"/>
-                       <field name="_padding_dummy" type="gpointer[]"/>
-               </struct>
-               <struct name="RestProxyClass">
-                       <field name="parent_class" type="GObjectClass"/>
-                       <field name="bind_valist" type="GCallback"/>
-                       <field name="new_call" type="GCallback"/>
-                       <field name="simple_run_valist" type="GCallback"/>
-                       <field name="_padding_dummy" type="gpointer[]"/>
-               </struct>
-               <struct name="RestXmlNode">
-                       <method name="find" symbol="rest_xml_node_find">
-                               <return-type type="RestXmlNode*"/>
-                               <parameters>
-                                       <parameter name="node" type="RestXmlNode*"/>
-                                       <parameter name="tag" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="rest_xml_node_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="node" type="RestXmlNode*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_attr" symbol="rest_xml_node_get_attr">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="node" type="RestXmlNode*"/>
-                                       <parameter name="attr_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="ref" symbol="rest_xml_node_ref">
-                               <return-type type="RestXmlNode*"/>
-                               <parameters>
-                                       <parameter name="node" type="RestXmlNode*"/>
-                               </parameters>
-                       </method>
-                       <method name="unref" symbol="rest_xml_node_unref">
-                               <return-type type="void"/>
+                       <property name="proxy" type="RestProxy*" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <vfunc name="prepare">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="node" type="RestXmlNode*"/>
+                                       <parameter name="call" type="RestProxyCall*"/>
+                                       <parameter name="error" type="GError**"/>
                                </parameters>
-                       </method>
-                       <field name="ref_count" type="int"/>
-                       <field name="name" type="gchar*"/>
-                       <field name="content" type="gchar*"/>
-                       <field name="children" type="GHashTable*"/>
-                       <field name="attrs" type="GHashTable*"/>
-                       <field name="next" type="RestXmlNode*"/>
-               </struct>
-               <struct name="RestXmlParser">
-                       <method name="new" symbol="rest_xml_parser_new">
+                       </vfunc>
+               </object>
+               <object name="RestXmlParser" parent="GObject" type-name="RestXmlParser" get-type="rest_xml_parser_get_type">
+                       <constructor name="new" symbol="rest_xml_parser_new">
                                <return-type type="RestXmlParser*"/>
-                       </method>
+                       </constructor>
                        <method name="parse_from_data" symbol="rest_xml_parser_parse_from_data">
                                <return-type type="RestXmlNode*"/>
                                <parameters>
@@ -445,57 +505,6 @@
                                        <parameter name="len" type="goffset"/>
                                </parameters>
                        </method>
-                       <field name="parent" type="GObject"/>
-               </struct>
-               <struct name="RestXmlParserClass">
-                       <field name="parent_class" type="GObjectClass"/>
-               </struct>
-               <enum name="OAuthSignatureMethod">
-                       <member name="PLAINTEXT" value="0"/>
-                       <member name="HMAC_SHA1" value="1"/>
-               </enum>
-               <enum name="RestProxyCallError">
-                       <member name="REST_PROXY_CALL_FAILED" value="0"/>
-               </enum>
-               <enum name="RestProxyError">
-                       <member name="REST_PROXY_ERROR_CANCELLED" value="1"/>
-                       <member name="REST_PROXY_ERROR_RESOLUTION" value="2"/>
-                       <member name="REST_PROXY_ERROR_CONNECTION" value="3"/>
-                       <member name="REST_PROXY_ERROR_SSL" value="4"/>
-                       <member name="REST_PROXY_ERROR_IO" value="5"/>
-                       <member name="REST_PROXY_ERROR_FAILED" value="6"/>
-                       <member name="REST_PROXY_ERROR_HTTP_MULTIPLE_CHOICES" value="300"/>
-                       <member name="REST_PROXY_ERROR_HTTP_MOVED_PERMANENTLY" value="301"/>
-                       <member name="REST_PROXY_ERROR_HTTP_FOUND" value="302"/>
-                       <member name="REST_PROXY_ERROR_HTTP_SEE_OTHER" value="303"/>
-                       <member name="REST_PROXY_ERROR_HTTP_NOT_MODIFIED" value="304"/>
-                       <member name="REST_PROXY_ERROR_HTTP_USE_PROXY" value="305"/>
-                       <member name="REST_PROXY_ERROR_HTTP_THREEOHSIX" value="306"/>
-                       <member name="REST_PROXY_ERROR_HTTP_TEMPORARY_REDIRECT" value="307"/>
-                       <member name="REST_PROXY_ERROR_HTTP_BAD_REQUEST" value="400"/>
-                       <member name="REST_PROXY_ERROR_HTTP_UNAUTHORIZED" value="401"/>
-                       <member name="REST_PROXY_ERROR_HTTP_FOUROHTWO" value="402"/>
-                       <member name="REST_PROXY_ERROR_HTTP_FORBIDDEN" value="403"/>
-                       <member name="REST_PROXY_ERROR_HTTP_NOT_FOUND" value="404"/>
-                       <member name="REST_PROXY_ERROR_HTTP_METHOD_NOT_ALLOWED" value="405"/>
-                       <member name="REST_PROXY_ERROR_HTTP_NOT_ACCEPTABLE" value="406"/>
-                       <member name="REST_PROXY_ERROR_HTTP_PROXY_AUTHENTICATION_REQUIRED" value="407"/>
-                       <member name="REST_PROXY_ERROR_HTTP_REQUEST_TIMEOUT" value="408"/>
-                       <member name="REST_PROXY_ERROR_HTTP_CONFLICT" value="409"/>
-                       <member name="REST_PROXY_ERROR_HTTP_GONE" value="410"/>
-                       <member name="REST_PROXY_ERROR_HTTP_LENGTH_REQUIRED" value="411"/>
-                       <member name="REST_PROXY_ERROR_HTTP_PRECONDITION_FAILED" value="412"/>
-                       <member name="REST_PROXY_ERROR_HTTP_REQUEST_ENTITY_TOO_LARGE" value="413"/>
-                       <member name="REST_PROXY_ERROR_HTTP_REQUEST_URI_TOO_LONG" value="414"/>
-                       <member name="REST_PROXY_ERROR_HTTP_UNSUPPORTED_MEDIA_TYPE" value="415"/>
-                       <member name="REST_PROXY_ERROR_HTTP_REQUESTED_RANGE_NOT_SATISFIABLE" value="416"/>
-                       <member name="REST_PROXY_ERROR_HTTP_EXPECTATION_FAILED" value="417"/>
-                       <member name="REST_PROXY_ERROR_HTTP_INTERNAL_SERVER_ERROR" value="500"/>
-                       <member name="REST_PROXY_ERROR_HTTP_NOT_IMPLEMENTED" value="501"/>
-                       <member name="REST_PROXY_ERROR_HTTP_BAD_GATEWAY" value="502"/>
-                       <member name="REST_PROXY_ERROR_HTTP_SERVICE_UNAVAILABLE" value="503"/>
-                       <member name="REST_PROXY_ERROR_HTTP_GATEWAY_TIMEOUT" value="504"/>
-                       <member name="REST_PROXY_ERROR_HTTP_HTTP_VERSION_NOT_SUPPORTED" value="505"/>
-               </enum>
+               </object>
        </namespace>
 </api>

diff --git a/vapi/packages/rest-0.6/rest-0.6.metadata b/vapi/packages/rest-0.6/rest-0.6.metadata
index d8b6fb3a8433a8c81570696b0b87e2935d0aed7c..a3bfe63d4c03c44f57f566cd87ed475d48ba35d0 100644 (file)
--- a/vapi/packages/rest-0.6/rest-0.6.metadata
+++ b/vapi/packages/rest-0.6/rest-0.6.metadata
@@ -12,14 +12,20 @@ RestProxyCallAsyncCallback cheader_filename="rest/rest-proxy-call.h" has_target=
 *Class hidden="1"
 *.parent hidden="1"
 
-rest_proxy_call_get_params type_arguments="string,string"
+rest_proxy_call_get_params type_arguments="string,string" transfer_ownership="1"
 rest_proxy_bind ellipsis="1"
 rest_proxy_new_call hidden="1"
 rest_proxy_call_add_headers ellipsis="1"
 rest_proxy_call_add_params ellipsis="1"
 rest_proxy_call_async name="run_async"
 rest_proxy_call_async.weak_object nullable="1"
+rest_proxy_call_async.callback delegate_target_pos="2.9"
 rest_proxy_call_async.userdata hidden="1"
+oauth_proxy_auth_step* deprecated="1"
+oauth_proxy*.weak_object nullable="1"
+oauth_proxy_auth_step_async.callback delegate_target_pos="3.9"
+oauth_proxy_request_token_async.callback delegate_target_pos="4.9"
+oauth_proxy_access_token_async.callback delegate_target_pos="4.9"
 RestProxyCallAsyncCallback.userdata hidden="1"
 RestProxyCallAsyncCallback.error nullable="1"
 RestProxyCallAsyncCallback.weak_object nullable="1"

diff --git a/vapi/rest-0.6.vapi b/vapi/rest-0.6.vapi
index 401dce70b4f0d305463fb4202405451d65429eca..bd91c0000a166cb57d6c8268381a06259afcebca 100644 (file)
--- a/vapi/rest-0.6.vapi
+++ b/vapi/rest-0.6.vapi
@@ -2,53 +2,70 @@
 
 [CCode (cprefix = "Rest", lower_case_cprefix = "rest_")]
 namespace Rest {
-       [CCode (cheader_filename = "rest/oauth-proxy.h")]
+       [CCode (cname = "OAuthProxy", cheader_filename = "rest/oauth-proxy.h")]
        public class OAuthProxy : Rest.Proxy {
                [CCode (cname = "oauth_proxy_new", type = "RestProxy*", has_construct_function = false)]
                public OAuthProxy (string consumer_key, string consumer_secret, string url_format, bool binding_required);
                [CCode (cname = "oauth_proxy_access_token")]
-               public static bool access_token (Rest.OAuthProxy proxy, string function, string verifier) throws GLib.Error;
+               public bool access_token (string function, string verifier) throws GLib.Error;
                [CCode (cname = "oauth_proxy_access_token_async")]
-               public static bool access_token_async (Rest.OAuthProxy proxy, string function, string verifier, Rest.OAuthProxyAuthCallback callback, GLib.Object weak_object) throws GLib.Error;
+               public bool access_token_async (string function, string verifier, [CCode (delegate_target_pos = 4.9)] Rest.OAuthProxyAuthCallback callback, GLib.Object? weak_object) throws GLib.Error;
+               [Deprecated]
                [CCode (cname = "oauth_proxy_auth_step")]
-               public static bool auth_step (Rest.OAuthProxy proxy, string function) throws GLib.Error;
+               public bool auth_step (string function) throws GLib.Error;
+               [Deprecated]
                [CCode (cname = "oauth_proxy_auth_step_async")]
-               public static bool auth_step_async (Rest.OAuthProxy proxy, string function, Rest.OAuthProxyAuthCallback callback, GLib.Object weak_object) throws GLib.Error;
+               public bool auth_step_async (string function, [CCode (delegate_target_pos = 3.9)] Rest.OAuthProxyAuthCallback callback, GLib.Object? weak_object) throws GLib.Error;
                [CCode (cname = "oauth_proxy_get_token")]
-               public static unowned string get_token (Rest.OAuthProxy proxy);
+               public unowned string get_token ();
                [CCode (cname = "oauth_proxy_get_token_secret")]
-               public static unowned string get_token_secret (Rest.OAuthProxy proxy);
+               public unowned string get_token_secret ();
                [CCode (cname = "oauth_proxy_is_oauth10a")]
-               public static bool is_oauth10a (Rest.OAuthProxy proxy);
+               public bool is_oauth10a ();
                [CCode (cname = "oauth_proxy_request_token")]
-               public static bool request_token (Rest.OAuthProxy proxy, string function, string callback_uri) throws GLib.Error;
+               public bool request_token (string function, string callback_uri) throws GLib.Error;
                [CCode (cname = "oauth_proxy_request_token_async")]
-               public static bool request_token_async (Rest.OAuthProxy proxy, string function, string callback_uri, Rest.OAuthProxyAuthCallback callback, GLib.Object weak_object) throws GLib.Error;
+               public bool request_token_async (string function, string callback_uri, [CCode (delegate_target_pos = 4.9)] Rest.OAuthProxyAuthCallback callback, GLib.Object? weak_object) throws GLib.Error;
                [CCode (cname = "oauth_proxy_set_token")]
-               public static void set_token (Rest.OAuthProxy proxy, string token);
+               public void set_token (string token);
                [CCode (cname = "oauth_proxy_set_token_secret")]
-               public static void set_token_secret (Rest.OAuthProxy proxy, string token_secret);
+               public void set_token_secret (string token_secret);
                [CCode (cname = "oauth_proxy_new_with_token", type = "RestProxy*", has_construct_function = false)]
                public OAuthProxy.with_token (string consumer_key, string consumer_secret, string token, string token_secret, string url_format, bool binding_required);
+               [NoAccessorMethod]
+               public string consumer_key { owned get; construct; }
+               [NoAccessorMethod]
+               public string consumer_secret { owned get; construct; }
+               public string token { get; set; }
+               public string token_secret { get; set; }
        }
        [CCode (cheader_filename = "rest/oauth-proxy-call.h")]
        public class OAuthProxyCall : Rest.ProxyCall {
+               [CCode (has_construct_function = false)]
+               protected OAuthProxyCall ();
        }
        [CCode (cheader_filename = "rest/rest-proxy.h")]
        public class Proxy : GLib.Object {
                [CCode (has_construct_function = false)]
                public Proxy (string url_format, bool binding_required);
                public bool bind (...);
-               public bool bind_valist (void* @params);
+               public virtual bool bind_valist (void* @params);
                public static GLib.Quark error_quark ();
                public unowned string get_user_agent ();
                public Rest.ProxyCall new_call ();
                public void set_user_agent (string user_agent);
                public bool simple_run (string payload, int64 len) throws GLib.Error;
-               public bool simple_run_valist (string payload, int64 len, void* @params) throws GLib.Error;
+               public virtual bool simple_run_valist (string payload, int64 len, void* @params) throws GLib.Error;
+               [NoAccessorMethod]
+               public bool binding_required { get; set; }
+               [NoAccessorMethod]
+               public string url_format { owned get; set; }
+               public string user_agent { get; set; }
        }
        [CCode (cheader_filename = "rest/rest-proxy-call.h")]
        public class ProxyCall : GLib.Object {
+               [CCode (has_construct_function = false)]
+               protected ProxyCall ();
                public void add_header (string header, string value);
                public void add_headers (...);
                public void add_headers_from_valist (void* headers);
@@ -58,7 +75,7 @@ namespace Rest {
                public bool cancel ();
                public static GLib.Quark error_quark ();
                public unowned string get_method ();
-               public unowned GLib.HashTable<string,string> get_params ();
+               public GLib.HashTable<string,string> get_params ();
                public unowned string get_payload ();
                public int64 get_payload_length ();
                public unowned GLib.HashTable get_response_headers ();
@@ -67,17 +84,21 @@ namespace Rest {
                public unowned string lookup_header (string header);
                public unowned string lookup_param (string param);
                public unowned string lookup_response_header (string header);
+               [NoWrapper]
+               public virtual bool prepare () throws GLib.Error;
                public void remove_header (string header);
                public void remove_param (string param);
                public bool run (out unowned GLib.MainLoop loop) throws GLib.Error;
                [CCode (cname = "rest_proxy_call_async")]
-               public bool run_async (Rest.ProxyCallAsyncCallback callback, GLib.Object? weak_object) throws GLib.Error;
+               public bool run_async ([CCode (delegate_target_pos = 2.9)] Rest.ProxyCallAsyncCallback callback, GLib.Object? weak_object) throws GLib.Error;
                public void set_function (string function);
                public void set_method (string method);
                public bool sync () throws GLib.Error;
+               [NoAccessorMethod]
+               public Rest.Proxy proxy { owned get; construct; }
        }
        [Compact]
-       [CCode (ref_function = "rest_xml_node_ref", unref_function = "rest_xml_node_unref", cheader_filename = "rest/rest-xml-parser.h")]
+       [CCode (ref_function = "rest_xml_node_ref", unref_function = "rest_xml_node_unref", type_id = "REST_TYPE_XML_NODE", cheader_filename = "rest/rest-xml-parser.h")]
        public class XmlNode {
                public weak GLib.HashTable attrs;
                public weak GLib.HashTable children;