From: Evan Nemerson Date: Fri, 2 Apr 2010 23:26:35 +0000 (-0700) Subject: libsoup-2.4: add many missing type_arguments X-Git-Tag: 0.8.1~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acbf26e896a7586aa9b7f9240ba2213611371915;p=thirdparty%2Fvala.git libsoup-2.4: add many missing type_arguments Partially fixes bug 609875. --- diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi index 78291b415..dd83ee531 100644 --- a/vapi/libsoup-2.4.vapi +++ b/vapi/libsoup-2.4.vapi @@ -33,11 +33,10 @@ namespace Soup { [CCode (has_construct_function = false)] public Auth (GLib.Type type, Soup.Message msg, string auth_header); public virtual void authenticate (string username, string password); - public void free_protection_space (GLib.SList space); public virtual unowned string get_authorization (Soup.Message msg); public unowned string get_host (); public unowned string get_info (); - public virtual unowned GLib.SList get_protection_space (Soup.URI source_uri); + public virtual GLib.SList get_protection_space (Soup.URI source_uri); public unowned string get_realm (); public unowned string get_scheme_name (); public virtual bool update (Soup.Message msg, string auth_header); @@ -153,7 +152,7 @@ namespace Soup { [CCode (has_construct_function = false)] public CookieJar (); public void add_cookie (Soup.Cookie cookie); - public unowned GLib.SList all_cookies (); + public GLib.SList all_cookies (); public void delete_cookie (Soup.Cookie cookie); public unowned string get_cookies (Soup.URI uri, bool for_http); public virtual void save (); @@ -299,10 +298,10 @@ namespace Soup { public bool get_ranges (int64 total_length, out unowned Soup.Range ranges, int length); public void remove (string name); public void replace (string name, string value); - public void set_content_disposition (string disposition, GLib.HashTable @params); + public void set_content_disposition (string disposition, GLib.HashTable? @params); public void set_content_length (int64 content_length); public void set_content_range (int64 start, int64 end, int64 total_length); - public void set_content_type (string content_type, GLib.HashTable @params); + public void set_content_type (string content_type, GLib.HashTable? @params); public void set_encoding (Soup.Encoding encoding); public void set_expectations (Soup.Expectation expectations); public void set_range (int64 start, int64 end); @@ -481,7 +480,7 @@ namespace Soup { public void set_port (uint port); public void set_query (string query); public void set_query_from_fields (...); - public void set_query_from_form (GLib.HashTable form); + public void set_query_from_form (GLib.HashTable form); public void set_scheme (string scheme); public void set_user (string user); public string to_string (bool just_path_and_query); @@ -683,7 +682,7 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h", has_target = false)] public delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3, Soup.Address p4, void* p5); [CCode (cheader_filename = "libsoup/soup.h")] - public delegate void ServerCallback (Soup.Server server, Soup.Message msg, string path, GLib.HashTable query, Soup.ClientContext client); + public delegate void ServerCallback (Soup.Server server, Soup.Message msg, string path, GLib.HashTable query, Soup.ClientContext client); [CCode (cheader_filename = "libsoup/soup.h")] public delegate void SessionCallback (Soup.Session session, Soup.Message msg); [CCode (cheader_filename = "libsoup/soup.h")] @@ -885,27 +884,25 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public static unowned GLib.TimeoutSource add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, void* data); [CCode (cheader_filename = "libsoup/soup.h")] - public static void cookies_free (GLib.SList cookies); + public static GLib.SList cookies_from_request (Soup.Message msg); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.SList cookies_from_request (Soup.Message msg); + public static GLib.SList cookies_from_response (Soup.Message msg); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.SList cookies_from_response (Soup.Message msg); + public static unowned string cookies_to_cookie_header (GLib.SList cookies); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned string cookies_to_cookie_header (GLib.SList cookies); + public static void cookies_to_request (GLib.SList cookies, Soup.Message msg); [CCode (cheader_filename = "libsoup/soup.h")] - public static void cookies_to_request (GLib.SList cookies, Soup.Message msg); + public static void cookies_to_response (GLib.SList cookies, Soup.Message msg); [CCode (cheader_filename = "libsoup/soup.h")] - public static void cookies_to_response (GLib.SList cookies, Soup.Message msg); + public static GLib.HashTable form_decode (string encoded_form); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.HashTable form_decode (string encoded_form); - [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.HashTable form_decode_multipart (Soup.Message msg, string file_control_name, out unowned string filename, out unowned string content_type, out unowned Soup.Buffer file); + public static GLib.HashTable form_decode_multipart (Soup.Message msg, string file_control_name, out string filename, out string content_type, out Soup.Buffer file); [CCode (cheader_filename = "libsoup/soup.h")] public static unowned string form_encode (...); [CCode (cheader_filename = "libsoup/soup.h")] public static unowned string form_encode_datalist (void* form_data_set); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned string form_encode_hash (GLib.HashTable form_data_set); + public static unowned string form_encode_hash (GLib.HashTable form_data_set); [CCode (cheader_filename = "libsoup/soup.h")] public static unowned string form_encode_valist (string first_field, void* args); [CCode (cheader_filename = "libsoup/soup.h")] @@ -913,25 +910,21 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public static unowned Soup.Message form_request_new_from_datalist (string method, string uri, void* form_data_set); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned Soup.Message form_request_new_from_hash (string method, string uri, GLib.HashTable form_data_set); + public static unowned Soup.Message form_request_new_from_hash (string method, string uri, GLib.HashTable form_data_set); [CCode (cheader_filename = "libsoup/soup.h")] public static unowned Soup.Message form_request_new_from_multipart (string uri, Soup.Multipart multipart); [CCode (cheader_filename = "libsoup/soup.h")] public static bool header_contains (string header, string token); [CCode (cheader_filename = "libsoup/soup.h")] - public static void header_free_list (GLib.SList list); - [CCode (cheader_filename = "libsoup/soup.h")] - public static void header_free_param_list (GLib.HashTable param_list); - [CCode (cheader_filename = "libsoup/soup.h")] public static void header_g_string_append_param (GLib.StringBuilder str, string name, string value); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.SList header_parse_list (string header); + public static GLib.SList header_parse_list (string header); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.HashTable header_parse_param_list (string header); + public static GLib.HashTable header_parse_param_list (string header); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.SList header_parse_quality_list (string header, GLib.SList unacceptable); + public static GLib.SList header_parse_quality_list (string header, GLib.SList unacceptable); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.HashTable header_parse_semi_param_list (string header); + public static GLib.HashTable header_parse_semi_param_list (string header); [CCode (cheader_filename = "libsoup/soup.h")] public static bool headers_parse (string str, int len, Soup.MessageHeaders dest); [CCode (cheader_filename = "libsoup/soup.h")] @@ -969,19 +962,19 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public static bool value_array_to_args (GLib.ValueArray array, void* args); [CCode (cheader_filename = "libsoup/soup.h")] - public static void value_hash_insert (GLib.HashTable hash, string key, GLib.Type type); + public static void value_hash_insert (GLib.HashTable hash, string key, GLib.Type type, ...); [CCode (cheader_filename = "libsoup/soup.h")] - public static void value_hash_insert_vals (GLib.HashTable hash, ...); + public static void value_hash_insert_vals (GLib.HashTable hash, ...); [CCode (cheader_filename = "libsoup/soup.h")] - public static void value_hash_insert_value (GLib.HashTable hash, string key, GLib.Value value); + public static void value_hash_insert_value (GLib.HashTable hash, string key, GLib.Value value); [CCode (cheader_filename = "libsoup/soup.h")] - public static bool value_hash_lookup (GLib.HashTable hash, string key, GLib.Type type); + public static bool value_hash_lookup (GLib.HashTable hash, string key, GLib.Type type); [CCode (cheader_filename = "libsoup/soup.h")] - public static bool value_hash_lookup_vals (GLib.HashTable hash, ...); + public static bool value_hash_lookup_vals (GLib.HashTable hash, ...); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.HashTable value_hash_new (); + public static GLib.HashTable value_hash_new (); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.HashTable value_hash_new_with_vals (...); + public static GLib.HashTable value_hash_new_with_vals (...); [PrintfFormat] [CCode (cheader_filename = "libsoup/soup.h")] public static unowned string xmlrpc_build_fault (int fault_code, string fault_format, ...); diff --git a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata index 38a275447..4ae8b0679 100644 --- a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata +++ b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata @@ -1,5 +1,7 @@ Soup cheader_filename="libsoup/soup.h" soup_add_io_watch hidden="1" +soup_auth_get_protection_space type_arguments="string" transfer_ownership="1" +soup_auth_free_protection_space hidden="1" soup_auth_is_authenticated hidden="1" soup_auth_is_for_proxy hidden="1" SoupAuthDomain:add-path hidden="1" @@ -17,7 +19,25 @@ soup_auth_domain_digest_set_auth_callback.dnotify hidden="1" SoupBuffer ref_function="soup_buffer_copy" unref_function="soup_buffer_free" soup_buffer_copy transfer_ownership="1" soup_cookie_copy transfer_ownership="1" +soup_cookies_free hidden="1" +soup_cookies_to_cookie_header.cookies type_arguments="Cookie" +soup_cookies_to_request.cookies type_arguments="Cookie" +soup_cookies_to_response.cookies type_arguments="Cookie" +soup_cookie_jar_all_cookies type_arguments="Cookie" transfer_ownership="1" soup_date_copy transfer_ownership="1" +soup_form_decode type_arguments="string,string" transfer_ownership="1" +soup_form_decode_multipart type_arguments="string,string" transfer_ownership="1" +soup_form_decode_multipart.filename transfer_ownership="1" +soup_form_decode_multipart.content_type transfer_ownership="1" +soup_form_decode_multipart.file transfer_ownership="1" +soup_form_encode_hash.form_data_set type_arguments="string,string" +soup_form_request_new_from_hash.form_data_set type_arguments="string,string" +soup_header_free_param_list hidden="1" +soup_header_free_list hidden="1" +soup_header_parse_list type_arguments="string" transfer_ownership="1" +soup_header_parse_param_list type_arguments="string,string" transfer_ownership="1" +soup_header_parse_quality_list type_arguments="string" transfer_ownership="1" +soup_header_parse_quality_list.unacceptable type_arguments="string" soup_logger_set_printer.printer transfer_ownership="1" soup_logger_set_printer.printer_data hidden="1" soup_logger_set_printer.destroy hidden="1" @@ -38,15 +58,21 @@ SoupMessage::wrote_body_data has_emitter="1" SoupMessage::wrote_chunk has_emitter="1" SoupMessage::wrote_headers has_emitter="1" SoupMessage::wrote_informational has_emitter="1" +soup_cookies_from_request type_arguments="Cookie" transfer_ownership="1" +soup_cookies_from_response type_arguments="Cookie" transfer_ownership="1" +soup_header_parse_semi_param_list type_arguments="string,string" transfer_ownership="1" soup_message_headers_get_content_disposition.disposition transfer_ownership="1" soup_message_headers_get_content_disposition.params is_out="1" transfer_ownership="1" nullable="1" soup_message_headers_get_content_type.params is_out="1" transfer_ownership="1" nullable="1" soup_message_set_chunk_allocator.allocator transfer_ownership="1" soup_message_set_chunk_allocator.destroy_notify hidden="1" SoupMessageBody.data type_name="uint8" is_array="1" +soup_message_headers_set_content_disposition.params type_arguments="string,string" nullable="1" +soup_message_headers_set_content_type.params type_arguments="string,string" nullable="1" soup_server_new ellipsis="1" soup_server_add_handler.destroy hidden="1" soup_server_add_handler.callback transfer_ownership="1" +SoupServerCallback.query type_arguments="string,string" SoupSession::add_feature has_emitter="1" SoupSession::add_feature_by_type has_emitter="1" SoupSession::remove_feature_by_type has_emitter="1" @@ -58,8 +84,12 @@ soup_uri_decode transfer_ownership="1" soup_uri_encode transfer_ownership="1" soup_uri_encode.escape_extra nullable="1" soup_uri_copy transfer_ownership="1" +soup_uri_set_query_from_form.form type_arguments="string,string" soup_uri_to_string transfer_ownership="1" soup_uri_normalize transfer_ownership="1" +soup_value_hash_insert ellipsis="1" +soup_value_hash_*.hash type_arguments="string,GLib.Value" +soup_value_hash_new* type_arguments="string,GLib.Value" transfer_ownership="1" soup_xmlrpc_build_fault ellipsis="1" printf_format="1" soup_xmlrpc_extract_method_call ellipsis="1" sentinel="G_TYPE_INVALID" soup_xmlrpc_extract_method_response ellipsis="1" sentinel="G_TYPE_INVALID"