[vala] rest-0.6: rename rest to rest-0.6, update to version 0.6.1

From: Evan Nemerson <evann src gnome org>
To: commits-list gnome org
Cc:
Subject: [vala] rest-0.6: rename rest to rest-0.6, update to version 0.6.1
Date: Mon, 17 May 2010 06:23:56 +0000 (UTC)
commit baff44e6a0909998bb7b3fe78c49576803961115
Author: Evan Nemerson <evan coeus-group com>
Date:   Sun May 16 23:20:17 2010 -0700

    rest-0.6: rename rest to rest-0.6, update to version 0.6.1

 vapi/Makefile.am                                   |    4 +-
 .../rest-0.6-custom.vala}                          |    0
 vapi/packages/rest-0.6/rest-0.6.files              |    1 +
 .../{rest/rest.gi => rest-0.6/rest-0.6.gi}         |  450 ++++++++------------
 .../rest.metadata => rest-0.6/rest-0.6.metadata}   |    2 +
 .../rest.namespace => rest-0.6/rest-0.6.namespace} |    0
 vapi/packages/rest/rest.files                      |    1 -
 vapi/{rest.deps => rest-0.6.deps}                  |    0
 vapi/{rest.vapi => rest-0.6.vapi}                  |  115 ++----
 9 files changed, 216 insertions(+), 357 deletions(-)
---
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 65f54c2..2349dd0 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -176,8 +176,8 @@ dist_vapi_DATA = \
 	raptor.vapi \
 	rasqal.vapi \
 	readline.vapi \
-	rest.deps \
-	rest.vapi \
+	rest-0.6.deps \
+	rest-0.6.vapi \
 	sdl.vapi \
 	sdl-gfx.vapi \
 	sdl-image.vapi \
diff --git a/vapi/packages/rest/rest-custom.vala b/vapi/packages/rest-0.6/rest-0.6-custom.vala
similarity index 100%
rename from vapi/packages/rest/rest-custom.vala
rename to vapi/packages/rest-0.6/rest-0.6-custom.vala
diff --git a/vapi/packages/rest-0.6/rest-0.6.files b/vapi/packages/rest-0.6/rest-0.6.files
new file mode 100644
index 0000000..1db420b
--- /dev/null
+++ b/vapi/packages/rest-0.6/rest-0.6.files
@@ -0,0 +1 @@
+include/rest-0.6/rest/*.h
diff --git a/vapi/packages/rest/rest.gi b/vapi/packages/rest-0.6/rest-0.6.gi
similarity index 67%
rename from vapi/packages/rest/rest.gi
rename to vapi/packages/rest-0.6/rest-0.6.gi
index 2da0d1c..fed2554 100644
--- a/vapi/packages/rest/rest.gi
+++ b/vapi/packages/rest-0.6/rest-0.6.gi
@@ -19,230 +19,28 @@
 				<parameter name="userdata" type="gpointer"/>
 			</parameters>
 		</callback>
-		<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="FacebookProxy" parent="RestProxy" type-name="FacebookProxy" get-type="facebook_proxy_get_type">
-			<method name="build_login_url" symbol="facebook_proxy_build_login_url">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="FacebookProxy*"/>
-					<parameter name="frob" type="char*"/>
-				</parameters>
-			</method>
-			<method name="build_permission_url" symbol="facebook_proxy_build_permission_url">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="FacebookProxy*"/>
-					<parameter name="perms" type="char*"/>
-				</parameters>
-			</method>
-			<method name="get_api_key" symbol="facebook_proxy_get_api_key">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="FacebookProxy*"/>
-				</parameters>
-			</method>
-			<method name="get_app_secret" symbol="facebook_proxy_get_app_secret">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="FacebookProxy*"/>
-				</parameters>
-			</method>
-			<method name="get_session_key" symbol="facebook_proxy_get_session_key">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="FacebookProxy*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="facebook_proxy_new">
-				<return-type type="RestProxy*"/>
-				<parameters>
-					<parameter name="api_key" type="char*"/>
-					<parameter name="app_secret" type="char*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_session" symbol="facebook_proxy_new_with_session">
-				<return-type type="RestProxy*"/>
-				<parameters>
-					<parameter name="api_key" type="char*"/>
-					<parameter name="app_secret" type="char*"/>
-					<parameter name="session_key" type="char*"/>
-				</parameters>
-			</constructor>
-			<method name="set_app_secret" symbol="facebook_proxy_set_app_secret">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="proxy" type="FacebookProxy*"/>
-					<parameter name="secret" type="char*"/>
-				</parameters>
-			</method>
-			<method name="set_session_key" symbol="facebook_proxy_set_session_key">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="proxy" type="FacebookProxy*"/>
-					<parameter name="session_key" type="char*"/>
-				</parameters>
-			</method>
-			<method name="sign" symbol="facebook_proxy_sign">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="FacebookProxy*"/>
-					<parameter name="params" type="GHashTable*"/>
-				</parameters>
-			</method>
-			<property name="api-key" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="app-secret" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-			<property name="session-key" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="FacebookProxyCall" parent="RestProxyCall" type-name="FacebookProxyCall" get-type="facebook_proxy_call_get_type">
-		</object>
-		<object name="FlickrProxy" parent="RestProxy" type-name="FlickrProxy" get-type="flickr_proxy_get_type">
-			<method name="build_login_url" symbol="flickr_proxy_build_login_url">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="FlickrProxy*"/>
-					<parameter name="frob" type="char*"/>
-				</parameters>
-			</method>
-			<method name="get_api_key" symbol="flickr_proxy_get_api_key">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="FlickrProxy*"/>
-				</parameters>
-			</method>
-			<method name="get_shared_secret" symbol="flickr_proxy_get_shared_secret">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="FlickrProxy*"/>
-				</parameters>
-			</method>
-			<method name="get_token" symbol="flickr_proxy_get_token">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="FlickrProxy*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="flickr_proxy_new">
-				<return-type type="RestProxy*"/>
-				<parameters>
-					<parameter name="api_key" type="char*"/>
-					<parameter name="shared_secret" type="char*"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_token" symbol="flickr_proxy_new_with_token">
-				<return-type type="RestProxy*"/>
-				<parameters>
-					<parameter name="api_key" type="char*"/>
-					<parameter name="shared_secret" type="char*"/>
-					<parameter name="token" type="char*"/>
-				</parameters>
-			</constructor>
-			<method name="set_token" symbol="flickr_proxy_set_token">
-				<return-type type="void"/>
+		<struct name="OAuthProxy">
+			<method name="access_token" symbol="oauth_proxy_access_token">
+				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="proxy" type="FlickrProxy*"/>
-					<parameter name="token" type="char*"/>
+					<parameter name="proxy" type="OAuthProxy*"/>
+					<parameter name="function" type="char*"/>
+					<parameter name="verifier" type="char*"/>
+					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
-			<method name="sign" symbol="flickr_proxy_sign">
-				<return-type type="char*"/>
+			<method name="access_token_async" symbol="oauth_proxy_access_token_async">
+				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="proxy" type="FlickrProxy*"/>
-					<parameter name="params" type="GHashTable*"/>
+					<parameter name="proxy" type="OAuthProxy*"/>
+					<parameter name="function" type="char*"/>
+					<parameter name="verifier" type="char*"/>
+					<parameter name="callback" type="OAuthProxyAuthCallback"/>
+					<parameter name="weak_object" type="GObject*"/>
+					<parameter name="user_data" type="gpointer"/>
+					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
-			<property name="api-key" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="shared-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"/>
-		</object>
-		<object name="FlickrProxyCall" parent="RestProxyCall" type-name="FlickrProxyCall" get-type="flickr_proxy_call_get_type">
-		</object>
-		<object name="OAuthProxy" parent="RestProxy" type-name="OAuthProxy" get-type="oauth_proxy_get_type">
 			<method name="auth_step" symbol="oauth_proxy_auth_step">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -274,7 +72,13 @@
 					<parameter name="proxy" type="OAuthProxy*"/>
 				</parameters>
 			</method>
-			<constructor name="new" symbol="oauth_proxy_new">
+			<method name="is_oauth10a" symbol="oauth_proxy_is_oauth10a">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="proxy" type="OAuthProxy*"/>
+				</parameters>
+			</method>
+			<method name="new" symbol="oauth_proxy_new">
 				<return-type type="RestProxy*"/>
 				<parameters>
 					<parameter name="consumer_key" type="char*"/>
@@ -282,8 +86,8 @@
 					<parameter name="url_format" type="gchar*"/>
 					<parameter name="binding_required" type="gboolean"/>
 				</parameters>
-			</constructor>
-			<constructor name="new_with_token" symbol="oauth_proxy_new_with_token">
+			</method>
+			<method name="new_with_token" symbol="oauth_proxy_new_with_token">
 				<return-type type="RestProxy*"/>
 				<parameters>
 					<parameter name="consumer_key" type="char*"/>
@@ -293,7 +97,28 @@
 					<parameter name="url_format" type="gchar*"/>
 					<parameter name="binding_required" type="gboolean"/>
 				</parameters>
-			</constructor>
+			</method>
+			<method name="request_token" symbol="oauth_proxy_request_token">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="proxy" type="OAuthProxy*"/>
+					<parameter name="function" type="char*"/>
+					<parameter name="callback_uri" type="char*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="request_token_async" symbol="oauth_proxy_request_token_async">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="proxy" type="OAuthProxy*"/>
+					<parameter name="function" type="char*"/>
+					<parameter name="callback_uri" type="char*"/>
+					<parameter name="callback" type="OAuthProxyAuthCallback"/>
+					<parameter name="weak_object" type="GObject*"/>
+					<parameter name="user_data" type="gpointer"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<method name="set_token" symbol="oauth_proxy_set_token">
 				<return-type type="void"/>
 				<parameters>
@@ -308,14 +133,20 @@
 					<parameter name="token_secret" type="char*"/>
 				</parameters>
 			</method>
-			<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">
+			<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">
 			<method name="bind" symbol="rest_proxy_bind">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -338,19 +169,19 @@
 					<parameter name="proxy" type="RestProxy*"/>
 				</parameters>
 			</method>
-			<constructor name="new" symbol="rest_proxy_new">
+			<method name="new" symbol="rest_proxy_new">
 				<return-type type="RestProxy*"/>
 				<parameters>
 					<parameter name="url_format" type="gchar*"/>
 					<parameter name="binding_required" type="gboolean"/>
 				</parameters>
-			</constructor>
-			<constructor name="new_call" symbol="rest_proxy_new_call">
+			</method>
+			<method name="new_call" symbol="rest_proxy_new_call">
 				<return-type type="RestProxyCall*"/>
 				<parameters>
 					<parameter name="proxy" type="RestProxy*"/>
 				</parameters>
-			</constructor>
+			</method>
 			<method name="set_user_agent" symbol="rest_proxy_set_user_agent">
 				<return-type type="void"/>
 				<parameters>
@@ -377,34 +208,9 @@
 					<parameter name="params" type="va_list"/>
 				</parameters>
 			</method>
-			<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">
+			<field name="parent" type="GObject"/>
+		</struct>
+		<struct name="RestProxyCall">
 			<method name="add_header" symbol="rest_proxy_call_add_header">
 				<return-type type="void"/>
 				<parameters>
@@ -461,7 +267,6 @@
 				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
 			<method name="error_quark" symbol="rest_proxy_call_error_quark">
@@ -573,19 +378,65 @@
 					<parameter name="error_out" type="GError**"/>
 				</parameters>
 			</method>
-			<property name="proxy" type="RestProxy*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<vfunc name="prepare">
-				<return-type type="gboolean"/>
+			<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="call" type="RestProxyCall*"/>
-					<parameter name="error" type="GError**"/>
+					<parameter name="node" type="RestXmlNode*"/>
+					<parameter name="tag" type="gchar*"/>
 				</parameters>
-			</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">
+			</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*"/>
+		</struct>
+		<struct name="RestXmlParser">
+			<method name="new" symbol="rest_xml_parser_new">
 				<return-type type="RestXmlParser*"/>
-			</constructor>
+			</method>
 			<method name="parse_from_data" symbol="rest_xml_parser_parse_from_data">
 				<return-type type="RestXmlNode*"/>
 				<parameters>
@@ -594,6 +445,57 @@
 					<parameter name="len" type="goffset"/>
 				</parameters>
 			</method>
-		</object>
+			<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>
 	</namespace>
 </api>
diff --git a/vapi/packages/rest/rest.metadata b/vapi/packages/rest-0.6/rest-0.6.metadata
similarity index 97%
rename from vapi/packages/rest/rest.metadata
rename to vapi/packages/rest-0.6/rest-0.6.metadata
index 686040b..6d5d4a8 100644
--- a/vapi/packages/rest/rest.metadata
+++ b/vapi/packages/rest-0.6/rest-0.6.metadata
@@ -12,6 +12,8 @@ RestProxyCallError RestProxyCall cheader_filename="rest/rest-proxy-call.h" error
 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"
+*.priv hidden="1"
+*Class hidden="1"
 
 rest_proxy_call_get_params type_arguments="string,string"
 rest_proxy_bind ellipsis="1"
diff --git a/vapi/packages/rest/rest.namespace b/vapi/packages/rest-0.6/rest-0.6.namespace
similarity index 100%
rename from vapi/packages/rest/rest.namespace
rename to vapi/packages/rest-0.6/rest-0.6.namespace
diff --git a/vapi/rest.deps b/vapi/rest-0.6.deps
similarity index 100%
rename from vapi/rest.deps
rename to vapi/rest-0.6.deps
diff --git a/vapi/rest.vapi b/vapi/rest-0.6.vapi
similarity index 55%
rename from vapi/rest.vapi
rename to vapi/rest-0.6.vapi
index 3d84ecb..ea2662f 100644
--- a/vapi/rest.vapi
+++ b/vapi/rest-0.6.vapi
@@ -1,65 +1,17 @@
-/* rest.vapi generated by vapigen, do not modify. */
+/* rest-0.6.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Rest", lower_case_cprefix = "rest_")]
 namespace Rest {
-	[CCode (cheader_filename = "rest/facebook-proxy.h")]
-	public class FacebookProxy : Rest.Proxy {
-		[CCode (cname = "facebook_proxy_new", type = "RestProxy*", has_construct_function = false)]
-		public FacebookProxy (string api_key, string app_secret);
-		[CCode (cname = "facebook_proxy_build_login_url")]
-		public static unowned string build_login_url (Rest.FacebookProxy proxy, string frob);
-		[CCode (cname = "facebook_proxy_build_permission_url")]
-		public static unowned string build_permission_url (Rest.FacebookProxy proxy, string perms);
-		[CCode (cname = "facebook_proxy_get_api_key")]
-		public static unowned string get_api_key (Rest.FacebookProxy proxy);
-		[CCode (cname = "facebook_proxy_get_app_secret")]
-		public static unowned string get_app_secret (Rest.FacebookProxy proxy);
-		[CCode (cname = "facebook_proxy_get_session_key")]
-		public static unowned string get_session_key (Rest.FacebookProxy proxy);
-		[CCode (cname = "facebook_proxy_set_app_secret")]
-		public static void set_app_secret (Rest.FacebookProxy proxy, string secret);
-		[CCode (cname = "facebook_proxy_set_session_key")]
-		public static void set_session_key (Rest.FacebookProxy proxy, string session_key);
-		[CCode (cname = "facebook_proxy_sign")]
-		public static unowned string sign (Rest.FacebookProxy proxy, GLib.HashTable @params);
-		[CCode (cname = "facebook_proxy_new_with_session", type = "RestProxy*", has_construct_function = false)]
-		public FacebookProxy.with_session (string api_key, string app_secret, string session_key);
-		public string api_key { get; construct; }
-		public string app_secret { get; set construct; }
-		public string session_key { get; set; }
-	}
-	[CCode (cheader_filename = "rest/facebook-proxy-call.h")]
-	public class FacebookProxyCall : Rest.ProxyCall {
-	}
-	[CCode (cheader_filename = "rest/flickr-proxy.h")]
-	public class FlickrProxy : Rest.Proxy {
-		[CCode (cname = "flickr_proxy_new", type = "RestProxy*", has_construct_function = false)]
-		public FlickrProxy (string api_key, string shared_secret);
-		[CCode (cname = "flickr_proxy_build_login_url")]
-		public static unowned string build_login_url (Rest.FlickrProxy proxy, string frob);
-		[CCode (cname = "flickr_proxy_get_api_key")]
-		public static unowned string get_api_key (Rest.FlickrProxy proxy);
-		[CCode (cname = "flickr_proxy_get_shared_secret")]
-		public static unowned string get_shared_secret (Rest.FlickrProxy proxy);
-		[CCode (cname = "flickr_proxy_get_token")]
-		public static unowned string get_token (Rest.FlickrProxy proxy);
-		[CCode (cname = "flickr_proxy_set_token")]
-		public static void set_token (Rest.FlickrProxy proxy, string token);
-		[CCode (cname = "flickr_proxy_sign")]
-		public static unowned string sign (Rest.FlickrProxy proxy, GLib.HashTable @params);
-		[CCode (cname = "flickr_proxy_new_with_token", type = "RestProxy*", has_construct_function = false)]
-		public FlickrProxy.with_token (string api_key, string shared_secret, string token);
-		public string api_key { get; construct; }
-		public string shared_secret { get; construct; }
-		public string token { get; set; }
-	}
-	[CCode (cheader_filename = "rest/flickr-proxy-call.h")]
-	public class FlickrProxyCall : Rest.ProxyCall {
-	}
+	[Compact]
 	[CCode (cheader_filename = "rest/oauth-proxy.h")]
-	public class OAuthProxy : Rest.Proxy {
+	public class OAuthProxy {
+		public weak Rest.Proxy parent;
 		[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;
+		[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;
 		[CCode (cname = "oauth_proxy_auth_step")]
 		public static bool auth_step (Rest.OAuthProxy proxy, string function) throws GLib.Error;
 		[CCode (cname = "oauth_proxy_auth_step_async")]
@@ -68,49 +20,49 @@ namespace Rest {
 		public static unowned string get_token (Rest.OAuthProxy proxy);
 		[CCode (cname = "oauth_proxy_get_token_secret")]
 		public static unowned string get_token_secret (Rest.OAuthProxy proxy);
+		[CCode (cname = "oauth_proxy_is_oauth10a")]
+		public static bool is_oauth10a (Rest.OAuthProxy proxy);
+		[CCode (cname = "oauth_proxy_request_token")]
+		public static bool request_token (Rest.OAuthProxy proxy, 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;
 		[CCode (cname = "oauth_proxy_set_token")]
 		public static void set_token (Rest.OAuthProxy proxy, string token);
 		[CCode (cname = "oauth_proxy_set_token_secret")]
 		public static void set_token_secret (Rest.OAuthProxy proxy, 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; }
 	}
+	[Compact]
 	[CCode (cheader_filename = "rest/oauth-proxy-call.h")]
-	public class OAuthProxyCall : Rest.ProxyCall {
+	public class OAuthProxyCall {
+		public weak Rest.ProxyCall parent;
 	}
-	[CCode (cheader_filename = "rest/rest-proxy.h")]
-	public class Proxy : GLib.Object {
+	[CCode (ref_function = "rest_proxy_ref", unref_function = "rest_proxy_unref", cheader_filename = "rest/rest-proxy.h")]
+	public class Proxy {
+		public weak GLib.Object parent;
 		[CCode (has_construct_function = false)]
 		public Proxy (string url_format, bool binding_required);
 		public bool bind (...);
-		public virtual bool bind_valist (void* @params);
+		public 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 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; }
+		public bool simple_run_valist (string payload, int64 len, void* @params) throws GLib.Error;
 	}
+	[Compact]
 	[CCode (cheader_filename = "rest/rest-proxy-call.h")]
-	public class ProxyCall : GLib.Object {
+	public class ProxyCall {
+		public weak GLib.Object parent;
 		public void add_header (string header, string value);
 		public void add_headers (...);
 		public void add_headers_from_valist (void* headers);
 		public void add_param (string param, string value);
 		public void add_params (...);
 		public void add_params_from_valist (void* @params);
-		public bool cancel () throws GLib.Error;
+		public bool cancel ();
 		public static GLib.Quark error_quark ();
 		public unowned string get_method ();
 		public unowned GLib.HashTable<string,string> get_params ();
@@ -122,8 +74,6 @@ 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;
@@ -132,11 +82,9 @@ namespace Rest {
 		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", type_id = "REST_TYPE_XML_NODE", cheader_filename = "rest/rest-xml-parser.h")]
+	[CCode (ref_function = "rest_xml_node_ref", unref_function = "rest_xml_node_unref", cheader_filename = "rest/rest-xml-parser.h")]
 	public class XmlNode {
 		public weak GLib.HashTable attrs;
 		public weak GLib.HashTable children;
@@ -147,12 +95,19 @@ namespace Rest {
 		public unowned Rest.XmlNode find (string tag);
 		public unowned string get_attr (string attr_name);
 	}
+	[Compact]
 	[CCode (cheader_filename = "rest/rest-xml-parser.h")]
-	public class XmlParser : GLib.Object {
+	public class XmlParser {
+		public weak GLib.Object parent;
 		[CCode (has_construct_function = false)]
 		public XmlParser ();
 		public unowned Rest.XmlNode parse_from_data (string data, int64 len);
 	}
+	[Compact]
+	[CCode (cheader_filename = "rest/rest-xml-parser.h")]
+	public class XmlParserClass {
+		public weak GLib.ObjectClass parent_class;
+	}
 	[CCode (cprefix = "", has_type_id = false, cheader_filename = "rest/oauth-proxy.h")]
 	public enum OAuthSignatureMethod {
 		PLAINTEXT,
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]