From: Evan Nemerson Date: Mon, 17 May 2010 06:20:17 +0000 (-0700) Subject: rest-0.6: rename rest to rest-0.6, update to version 0.6.1 X-Git-Tag: 0.9.1~64 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=baff44e6a0909998bb7b3fe78c49576803961115;p=thirdparty%2Fvala.git rest-0.6: rename rest to rest-0.6, update to version 0.6.1 --- diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 65f54c21e..2349dd0bc 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 000000000..1db420b6a --- /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 2da0d1ce8..fed255433 100644 --- a/vapi/packages/rest/rest.gi +++ b/vapi/packages/rest-0.6/rest-0.6.gi @@ -19,230 +19,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + + + - - + + - - + + + + + + + - - - - - - - @@ -274,7 +72,13 @@ - + + + + + + + @@ -282,8 +86,8 @@ - - + + @@ -293,7 +97,28 @@ - + + + + + + + + + + + + + + + + + + + + + + @@ -308,14 +133,20 @@ - - - - - - - - + + + + + + + + + + + + + + @@ -338,19 +169,19 @@ - + - - + + - + @@ -377,34 +208,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -461,7 +267,6 @@ - @@ -573,19 +378,65 @@ - - - + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -594,6 +445,57 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 686040be3..6d5d4a84d 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/packages/rest/rest.files b/vapi/packages/rest/rest.files deleted file mode 100644 index a579ad573..000000000 --- a/vapi/packages/rest/rest.files +++ /dev/null @@ -1 +0,0 @@ -include/rest/rest/*.h 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 3d84ecbe5..ea2662f5a 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 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,