vapi: Remove rest-0.6 bindings

https://bugzilla.gnome.org/show_bug.cgi?id=794477

15 files changed, 0 insertions, 987 deletions

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 097c38149..60b124093 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -233,10 +233,6 @@ dist_vapi_DATA = \
 	rasqal.vapi \
 	rasqal.deps \
 	readline.vapi \
-	rest-0.6.deps \
-	rest-0.6.vapi \
-	rest-extras-0.6.deps \
-	rest-extras-0.6.vapi \
 	rest-0.7.deps \
 	rest-0.7.vapi \
 	rest-extras-0.7.deps \
@@ -321,8 +317,6 @@ GIDL_BINDINGS = \
 	libwnck-1.0 \
 	loudmouth-1.0 \
 	purple \
-	rest-0.6 \
-	rest-extras-0.6 \
 	tracker-indexer-module-1.0 \
 	twitter-glib-1.0 \
 	unique-1.0 \
@@ -697,12 +691,6 @@ poppler-glib:
 purple:
 	$(GENVAPI) --library $(srcdir)/purple $(PACKAGESDIR)/purple/purple-custom.vala $(PACKAGESDIR)/purple/purple.gi
 
-rest-0.6:
-	$(GENVAPI) --library $(srcdir)/rest-0.6 $(PACKAGESDIR)/rest-0.6/rest-0.6-custom.vala $(PACKAGESDIR)/rest-0.6/rest-0.6.gi
-
-rest-extras-0.6:
-	$(GENVAPI) --library $(srcdir)/rest-extras-0.6 $(PACKAGESDIR)/rest-extras-0.6/rest-extras-0.6-custom.vala $(PACKAGESDIR)/rest-extras-0.6/rest-extras-0.6.gi
-
 rest-0.7:
 	$(GENVAPI) --library $(srcdir)/rest-0.7 --metadatadir $(METADATADIR) --pkg gio-2.0 $(GIRDIR)/Rest-0.7.gir
 
diff --git a/vapi/packages/rest-0.6/rest-0.6-custom.vala b/vapi/packages/rest-0.6/rest-0.6-custom.vala
deleted file mode 100644
index d47d0cb85..000000000
--- a/vapi/packages/rest-0.6/rest-0.6-custom.vala
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Rest {
-	[CCode (cheader_filename = "rest/rest-proxy.h")]
-	public class Proxy {
-		public virtual Rest.ProxyCall new_call ();
-	}
-
-	[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
deleted file mode 100644
index 5d82be854..000000000
--- a/vapi/packages/rest-0.6/rest-0.6.files
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 169c4dab1..000000000
--- a/vapi/packages/rest-0.6/rest-0.6.gi
+++ /dev/null
@@ -1,510 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="Rest">
-		<callback name="OAuthProxyAuthCallback">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="proxy" type="OAuthProxy*"/>
-				<parameter name="error" type="GError*"/>
-				<parameter name="weak_object" type="GObject*"/>
-				<parameter name="userdata" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="RestProxyCallAsyncCallback">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="call" type="RestProxyCall*"/>
-				<parameter name="error" type="GError*"/>
-				<parameter name="weak_object" type="GObject*"/>
-				<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="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>
-					<parameter name="proxy" type="OAuthProxy*"/>
-					<parameter name="function" type="char*"/>
-					<parameter name="verifier" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="access_token_async" symbol="oauth_proxy_access_token_async">
-				<return-type type="gboolean"/>
-				<parameters>
-					<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>
-			<method name="auth_step" symbol="oauth_proxy_auth_step">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="proxy" type="OAuthProxy*"/>
-					<parameter name="function" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="auth_step_async" symbol="oauth_proxy_auth_step_async">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="proxy" type="OAuthProxy*"/>
-					<parameter name="function" type="char*"/>
-					<parameter name="callback" type="OAuthProxyAuthCallback"/>
-					<parameter name="weak_object" type="GObject*"/>
-					<parameter name="user_data" type="gpointer"/>
-					<parameter name="error_out" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="get_token" symbol="oauth_proxy_get_token">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="OAuthProxy*"/>
-				</parameters>
-			</method>
-			<method name="get_token_secret" symbol="oauth_proxy_get_token_secret">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="OAuthProxy*"/>
-				</parameters>
-			</method>
-			<method name="is_oauth10a" symbol="oauth_proxy_is_oauth10a">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="proxy" type="OAuthProxy*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="oauth_proxy_new">
-				<return-type type="RestProxy*"/>
-				<parameters>
-					<parameter name="consumer_key" type="char*"/>
-					<parameter name="consumer_secret" type="char*"/>
-					<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">
-				<return-type type="RestProxy*"/>
-				<parameters>
-					<parameter name="consumer_key" type="char*"/>
-					<parameter name="consumer_secret" type="char*"/>
-					<parameter name="token" type="char*"/>
-					<parameter name="token_secret" type="char*"/>
-					<parameter name="url_format" type="gchar*"/>
-					<parameter name="binding_required" type="gboolean"/>
-				</parameters>
-			</constructor>
-			<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>
-					<parameter name="proxy" type="OAuthProxy*"/>
-					<parameter name="token" type="char*"/>
-				</parameters>
-			</method>
-			<method name="set_token_secret" symbol="oauth_proxy_set_token_secret">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="proxy" type="OAuthProxy*"/>
-					<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">
-			<method name="bind" symbol="rest_proxy_bind">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="proxy" type="RestProxy*"/>
-				</parameters>
-			</method>
-			<method name="bind_valist" symbol="rest_proxy_bind_valist">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="proxy" type="RestProxy*"/>
-					<parameter name="params" type="va_list"/>
-				</parameters>
-			</method>
-			<method name="error_quark" symbol="rest_proxy_error_quark">
-				<return-type type="GQuark"/>
-			</method>
-			<method name="get_user_agent" symbol="rest_proxy_get_user_agent">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="proxy" type="RestProxy*"/>
-				</parameters>
-			</method>
-			<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>
-			</constructor>
-			<constructor name="new_call" symbol="rest_proxy_new_call">
-				<return-type type="RestProxyCall*"/>
-				<parameters>
-					<parameter name="proxy" type="RestProxy*"/>
-				</parameters>
-			</constructor>
-			<method name="set_user_agent" symbol="rest_proxy_set_user_agent">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="proxy" type="RestProxy*"/>
-					<parameter name="user_agent" type="char*"/>
-				</parameters>
-			</method>
-			<method name="simple_run" symbol="rest_proxy_simple_run">
-				<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**"/>
-				</parameters>
-			</method>
-			<method name="simple_run_valist" symbol="rest_proxy_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>
-			</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">
-			<method name="add_header" symbol="rest_proxy_call_add_header">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="header" type="gchar*"/>
-					<parameter name="value" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="add_headers" symbol="rest_proxy_call_add_headers">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-				</parameters>
-			</method>
-			<method name="add_headers_from_valist" symbol="rest_proxy_call_add_headers_from_valist">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="headers" type="va_list"/>
-				</parameters>
-			</method>
-			<method name="add_param" symbol="rest_proxy_call_add_param">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="param" type="gchar*"/>
-					<parameter name="value" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="add_params" symbol="rest_proxy_call_add_params">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-				</parameters>
-			</method>
-			<method name="add_params_from_valist" symbol="rest_proxy_call_add_params_from_valist">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="params" type="va_list"/>
-				</parameters>
-			</method>
-			<method name="async" symbol="rest_proxy_call_async">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="callback" type="RestProxyCallAsyncCallback"/>
-					<parameter name="weak_object" type="GObject*"/>
-					<parameter name="userdata" type="gpointer"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="cancel" symbol="rest_proxy_call_cancel">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-				</parameters>
-			</method>
-			<method name="error_quark" symbol="rest_proxy_call_error_quark">
-				<return-type type="GQuark"/>
-			</method>
-			<method name="get_method" symbol="rest_proxy_call_get_method">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-				</parameters>
-			</method>
-			<method name="get_params" symbol="rest_proxy_call_get_params">
-				<return-type type="GHashTable*"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-				</parameters>
-			</method>
-			<method name="get_payload" symbol="rest_proxy_call_get_payload">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-				</parameters>
-			</method>
-			<method name="get_payload_length" symbol="rest_proxy_call_get_payload_length">
-				<return-type type="goffset"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-				</parameters>
-			</method>
-			<method name="get_response_headers" symbol="rest_proxy_call_get_response_headers">
-				<return-type type="GHashTable*"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-				</parameters>
-			</method>
-			<method name="get_status_code" symbol="rest_proxy_call_get_status_code">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-				</parameters>
-			</method>
-			<method name="get_status_message" symbol="rest_proxy_call_get_status_message">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-				</parameters>
-			</method>
-			<method name="lookup_header" symbol="rest_proxy_call_lookup_header">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="header" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="lookup_param" symbol="rest_proxy_call_lookup_param">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="param" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="lookup_response_header" symbol="rest_proxy_call_lookup_response_header">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="header" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="remove_header" symbol="rest_proxy_call_remove_header">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="header" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="remove_param" symbol="rest_proxy_call_remove_param">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="param" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="run" symbol="rest_proxy_call_run">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="loop" type="GMainLoop**"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="set_function" symbol="rest_proxy_call_set_function">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="function" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_method" symbol="rest_proxy_call_set_method">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="method" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="sync" symbol="rest_proxy_call_sync">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<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"/>
-				<parameters>
-					<parameter name="call" type="RestProxyCall*"/>
-					<parameter name="error" type="GError**"/>
-				</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">
-				<return-type type="RestXmlParser*"/>
-			</constructor>
-			<method name="parse_from_data" symbol="rest_xml_parser_parse_from_data">
-				<return-type type="RestXmlNode*"/>
-				<parameters>
-					<parameter name="parser" type="RestXmlParser*"/>
-					<parameter name="data" type="gchar*"/>
-					<parameter name="len" type="goffset"/>
-				</parameters>
-			</method>
-		</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
deleted file mode 100644
index a3bfe63d4..000000000
--- a/vapi/packages/rest-0.6/rest-0.6.metadata
+++ /dev/null
@@ -1,35 +0,0 @@
-OAuthProxy cheader_filename="rest/oauth-proxy.h"
-OAuthProxyCall cheader_filename="rest/oauth-proxy-call.h"
-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" 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"
-*.priv hidden="1"
-*Class hidden="1"
-*.parent hidden="1"
-
-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"
-OAuthProxyAuthCallback.userdata hidden="1"
-OAuthProxyAuthCallback.error nullable="1"
-OAuthProxyAuthCallback.weak_object nullable="1"
-
diff --git a/vapi/packages/rest-0.6/rest-0.6.namespace b/vapi/packages/rest-0.6/rest-0.6.namespace
deleted file mode 100644
index 1506a7263..000000000
--- a/vapi/packages/rest-0.6/rest-0.6.namespace
+++ /dev/null
@@ -1 +0,0 @@
-Rest
diff --git a/vapi/packages/rest-extras-0.6/rest-extras-0.6-custom.vala b/vapi/packages/rest-extras-0.6/rest-extras-0.6-custom.vala
deleted file mode 100644
index a53a3444a..000000000
--- a/vapi/packages/rest-extras-0.6/rest-extras-0.6-custom.vala
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Rest {
-	[CCode (cname="FacebookProxy", cheader_filename = "rest-extras/facebook-proxy.h")]
-	public class FacebookProxy : Rest.Proxy {
-	}
-	[CCode (cname="FacebookProxyCall", cheader_filename = "rest-extras/facebook-proxy-call.h")]
-	public class FacebookProxyCall : Rest.ProxyCall {
-	}
-	[CCode (cname="FlickrProxy", cheader_filename = "rest-extras/flickr-proxy.h")]
-	public class FlickrProxy : Rest.Proxy {
-	}
-	[CCode (cname="FlickrProxyCall", cheader_filename = "rest-extras/flickr-proxy-call.h")]
-	public class FlickrProxyCall : Rest.ProxyCall {
-	}
-}
diff --git a/vapi/packages/rest-extras-0.6/rest-extras-0.6.files b/vapi/packages/rest-extras-0.6/rest-extras-0.6.files
deleted file mode 100644
index 39c0eedcd..000000000
--- a/vapi/packages/rest-extras-0.6/rest-extras-0.6.files
+++ /dev/null
@@ -1 +0,0 @@
-include/rest-0.6/rest-extras/*.h
diff --git a/vapi/packages/rest-extras-0.6/rest-extras-0.6.gi b/vapi/packages/rest-extras-0.6/rest-extras-0.6.gi
deleted file mode 100644
index f06c22ebb..000000000
--- a/vapi/packages/rest-extras-0.6/rest-extras-0.6.gi
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="Rest">
-		<struct name="FacebookProxy">
-			<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>
-			<method name="new" symbol="facebook_proxy_new">
-				<return-type type="RestProxy*"/>
-				<parameters>
-					<parameter name="api_key" type="char*"/>
-					<parameter name="app_secret" type="char*"/>
-				</parameters>
-			</method>
-			<method 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>
-			</method>
-			<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>
-			<field name="parent" type="RestProxy"/>
-			<field name="priv" type="FacebookProxyPrivate*"/>
-		</struct>
-		<struct name="FacebookProxyCall">
-			<field name="parent" type="RestProxyCall"/>
-		</struct>
-		<struct name="FacebookProxyCallClass">
-			<field name="parent_class" type="RestProxyCallClass"/>
-			<field name="_padding_dummy" type="gpointer[]"/>
-		</struct>
-		<struct name="FacebookProxyClass">
-			<field name="parent_class" type="RestProxyClass"/>
-			<field name="_padding_dummy" type="gpointer[]"/>
-		</struct>
-		<struct name="FlickrProxy">
-			<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>
-			<method name="is_successful" symbol="flickr_proxy_is_successful">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="root" type="RestXmlNode*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="new" symbol="flickr_proxy_new">
-				<return-type type="RestProxy*"/>
-				<parameters>
-					<parameter name="api_key" type="char*"/>
-					<parameter name="shared_secret" type="char*"/>
-				</parameters>
-			</method>
-			<method 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>
-			</method>
-			<method name="set_token" symbol="flickr_proxy_set_token">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="proxy" type="FlickrProxy*"/>
-					<parameter name="token" type="char*"/>
-				</parameters>
-			</method>
-			<method name="sign" symbol="flickr_proxy_sign">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="proxy" type="FlickrProxy*"/>
-					<parameter name="params" type="GHashTable*"/>
-				</parameters>
-			</method>
-			<field name="parent" type="RestProxy"/>
-			<field name="priv" type="FlickrProxyPrivate*"/>
-		</struct>
-		<struct name="FlickrProxyCall">
-			<field name="parent" type="RestProxyCall"/>
-		</struct>
-		<struct name="FlickrProxyCallClass">
-			<field name="parent_class" type="RestProxyCallClass"/>
-			<field name="_padding_dummy" type="gpointer[]"/>
-		</struct>
-		<struct name="FlickrProxyClass">
-			<field name="parent_class" type="RestProxyClass"/>
-			<field name="_padding_dummy" type="gpointer[]"/>
-		</struct>
-	</namespace>
-</api>
diff --git a/vapi/packages/rest-extras-0.6/rest-extras-0.6.metadata b/vapi/packages/rest-extras-0.6/rest-extras-0.6.metadata
deleted file mode 100644
index 11e217823..000000000
--- a/vapi/packages/rest-extras-0.6/rest-extras-0.6.metadata
+++ /dev/null
@@ -1,7 +0,0 @@
-FacebookProxy cheader_filename="rest-extras/facebook-proxy.h"
-FacebookProxyCall cheader_filename="rest-extras/facebook-proxy-call.h"
-FlickrProxy cheader_filename="rest-extras/flickr-proxy.h"
-FlickrProxyCall cheader_filename="rest-extras/flickr-proxy-call.h"
-*.parent hidden="1"
-*.priv hidden="1"
-*Class hidden="1"
diff --git a/vapi/packages/rest-extras-0.6/rest-extras-0.6.namespace b/vapi/packages/rest-extras-0.6/rest-extras-0.6.namespace
deleted file mode 100644
index 1506a7263..000000000
--- a/vapi/packages/rest-extras-0.6/rest-extras-0.6.namespace
+++ /dev/null
@@ -1 +0,0 @@
-Rest
diff --git a/vapi/rest-0.6.deps b/vapi/rest-0.6.deps
deleted file mode 100644
index 3f9f152ac..000000000
--- a/vapi/rest-0.6.deps
+++ /dev/null
@@ -1,3 +0,0 @@
-libsoup-2.4
-libxml-2.0
-glib-2.0
diff --git a/vapi/rest-0.6.vapi b/vapi/rest-0.6.vapi
deleted file mode 100644
index 073b2d5f1..000000000
--- a/vapi/rest-0.6.vapi
+++ /dev/null
@@ -1,171 +0,0 @@
-/* rest-0.6.vapi generated by vapigen, do not modify. */
-
-namespace Rest {
-	[CCode (cheader_filename = "rest/oauth-proxy.h", cname = "OAuthProxy")]
-	public class OAuthProxy : Rest.Proxy {
-		[CCode (cname = "oauth_proxy_new", has_construct_function = false, type = "RestProxy*")]
-		public OAuthProxy (string consumer_key, string consumer_secret, string url_format, bool binding_required);
-		[CCode (cname = "oauth_proxy_access_token")]
-		public bool access_token (string function, string verifier) throws GLib.Error;
-		[CCode (cname = "oauth_proxy_access_token_async")]
-		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;
-		[CCode (cname = "oauth_proxy_auth_step")]
-		[Version (deprecated = true)]
-		public bool auth_step (string function) throws GLib.Error;
-		[CCode (cname = "oauth_proxy_auth_step_async")]
-		[Version (deprecated = true)]
-		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 unowned string get_token ();
-		[CCode (cname = "oauth_proxy_get_token_secret")]
-		public unowned string get_token_secret ();
-		[CCode (cname = "oauth_proxy_is_oauth10a")]
-		public bool is_oauth10a ();
-		[CCode (cname = "oauth_proxy_request_token")]
-		public bool request_token (string function, string callback_uri) throws GLib.Error;
-		[CCode (cname = "oauth_proxy_request_token_async")]
-		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 void set_token (string token);
-		[CCode (cname = "oauth_proxy_set_token_secret")]
-		public void set_token_secret (string token_secret);
-		[CCode (cname = "oauth_proxy_new_with_token", has_construct_function = false, type = "RestProxy*")]
-		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 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;
-		[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);
-		public void add_param (string param, string value);
-		public void add_params (...);
-		public void add_params_from_valist (void* @params);
-		public bool cancel ();
-		public static GLib.Quark error_quark ();
-		public unowned string get_method ();
-		public GLib.HashTable<string,string> get_params ();
-		public unowned string get_payload ();
-		public int64 get_payload_length ();
-		public unowned GLib.HashTable get_response_headers ();
-		public uint get_status_code ();
-		public unowned string get_status_message ();
-		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 ([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; }
-	}
-	[CCode (cheader_filename = "rest/rest-xml-parser.h", ref_function = "rest_xml_node_ref", type_id = "rest_xml_node_get_type ()", unref_function = "rest_xml_node_unref")]
-	[Compact]
-	public class XmlNode {
-		public weak GLib.HashTable attrs;
-		public weak GLib.HashTable children;
-		public weak string content;
-		public weak string name;
-		public weak Rest.XmlNode next;
-		public int ref_count;
-		public unowned Rest.XmlNode find (string tag);
-		public unowned string get_attr (string attr_name);
-	}
-	[CCode (cheader_filename = "rest/rest-xml-parser.h")]
-	public class XmlParser : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public XmlParser ();
-		public unowned Rest.XmlNode parse_from_data (string data, int64 len);
-	}
-	[CCode (cheader_filename = "rest/oauth-proxy.h", cprefix = "", has_type_id = false)]
-	public enum OAuthSignatureMethod {
-		PLAINTEXT,
-		HMAC_SHA1
-	}
-	[CCode (cheader_filename = "rest/rest-proxy-call.h", cprefix = "REST_PROXY_CALL_")]
-	public errordomain ProxyCallError {
-		FAILED
-	}
-	[CCode (cheader_filename = "rest/rest-proxy.h", cprefix = "REST_PROXY_ERROR_")]
-	public errordomain ProxyError {
-		CANCELLED,
-		RESOLUTION,
-		CONNECTION,
-		SSL,
-		IO,
-		FAILED,
-		HTTP_MULTIPLE_CHOICES,
-		HTTP_MOVED_PERMANENTLY,
-		HTTP_FOUND,
-		HTTP_SEE_OTHER,
-		HTTP_NOT_MODIFIED,
-		HTTP_USE_PROXY,
-		HTTP_THREEOHSIX,
-		HTTP_TEMPORARY_REDIRECT,
-		HTTP_BAD_REQUEST,
-		HTTP_UNAUTHORIZED,
-		HTTP_FOUROHTWO,
-		HTTP_FORBIDDEN,
-		HTTP_NOT_FOUND,
-		HTTP_METHOD_NOT_ALLOWED,
-		HTTP_NOT_ACCEPTABLE,
-		HTTP_PROXY_AUTHENTICATION_REQUIRED,
-		HTTP_REQUEST_TIMEOUT,
-		HTTP_CONFLICT,
-		HTTP_GONE,
-		HTTP_LENGTH_REQUIRED,
-		HTTP_PRECONDITION_FAILED,
-		HTTP_REQUEST_ENTITY_TOO_LARGE,
-		HTTP_REQUEST_URI_TOO_LONG,
-		HTTP_UNSUPPORTED_MEDIA_TYPE,
-		HTTP_REQUESTED_RANGE_NOT_SATISFIABLE,
-		HTTP_EXPECTATION_FAILED,
-		HTTP_INTERNAL_SERVER_ERROR,
-		HTTP_NOT_IMPLEMENTED,
-		HTTP_BAD_GATEWAY,
-		HTTP_SERVICE_UNAVAILABLE,
-		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);
-}
diff --git a/vapi/rest-extras-0.6.deps b/vapi/rest-extras-0.6.deps
deleted file mode 100644
index 983560318..000000000
--- a/vapi/rest-extras-0.6.deps
+++ /dev/null
@@ -1 +0,0 @@
-rest-0.6
diff --git a/vapi/rest-extras-0.6.vapi b/vapi/rest-extras-0.6.vapi
deleted file mode 100644
index 307bd14b2..000000000
--- a/vapi/rest-extras-0.6.vapi
+++ /dev/null
@@ -1,54 +0,0 @@
-/* rest-extras-0.6.vapi generated by vapigen, do not modify. */
-
-namespace Rest {
-	[CCode (cheader_filename = "rest-extras/facebook-proxy.h", cname = "FacebookProxy")]
-	public class FacebookProxy : Rest.Proxy {
-		[CCode (cname = "facebook_proxy_new", has_construct_function = false, type = "RestProxy*")]
-		public FacebookProxy (string api_key, string app_secret);
-		[CCode (cname = "facebook_proxy_build_login_url")]
-		public unowned string build_login_url (string frob);
-		[CCode (cname = "facebook_proxy_build_permission_url")]
-		public unowned string build_permission_url (string perms);
-		[CCode (cname = "facebook_proxy_get_api_key")]
-		public unowned string get_api_key ();
-		[CCode (cname = "facebook_proxy_get_app_secret")]
-		public unowned string get_app_secret ();
-		[CCode (cname = "facebook_proxy_get_session_key")]
-		public unowned string get_session_key ();
-		[CCode (cname = "facebook_proxy_set_app_secret")]
-		public void set_app_secret (string secret);
-		[CCode (cname = "facebook_proxy_set_session_key")]
-		public void set_session_key (string session_key);
-		[CCode (cname = "facebook_proxy_sign")]
-		public unowned string sign (GLib.HashTable @params);
-		[CCode (cname = "facebook_proxy_new_with_session", has_construct_function = false, type = "RestProxy*")]
-		public FacebookProxy.with_session (string api_key, string app_secret, string session_key);
-	}
-	[CCode (cheader_filename = "rest-extras/facebook-proxy-call.h", cname = "FacebookProxyCall")]
-	public class FacebookProxyCall : Rest.ProxyCall {
-	}
-	[CCode (cheader_filename = "rest-extras/flickr-proxy.h", cname = "FlickrProxy")]
-	public class FlickrProxy : Rest.Proxy {
-		[CCode (cname = "flickr_proxy_new", has_construct_function = false, type = "RestProxy*")]
-		public FlickrProxy (string api_key, string shared_secret);
-		[CCode (cname = "flickr_proxy_build_login_url")]
-		public unowned string build_login_url (string frob);
-		[CCode (cname = "flickr_proxy_get_api_key")]
-		public unowned string get_api_key ();
-		[CCode (cname = "flickr_proxy_get_shared_secret")]
-		public unowned string get_shared_secret ();
-		[CCode (cname = "flickr_proxy_get_token")]
-		public unowned string get_token ();
-		[CCode (cname = "flickr_proxy_is_successful")]
-		public static bool is_successful (Rest.XmlNode root) throws GLib.Error;
-		[CCode (cname = "flickr_proxy_set_token")]
-		public void set_token (string token);
-		[CCode (cname = "flickr_proxy_sign")]
-		public unowned string sign (GLib.HashTable @params);
-		[CCode (cname = "flickr_proxy_new_with_token", has_construct_function = false, type = "RestProxy*")]
-		public FlickrProxy.with_token (string api_key, string shared_secret, string token);
-	}
-	[CCode (cheader_filename = "rest-extras/flickr-proxy-call.h", cname = "FlickrProxyCall")]
-	public class FlickrProxyCall : Rest.ProxyCall {
-	}
-}