From 2c95c42e94bb4cb51d2bc9e09f09686a6adf162d Mon Sep 17 00:00:00 2001 From: Evan Nemerson Date: Sun, 21 Mar 2010 00:55:02 -0700 Subject: [PATCH] libsoup-2.4: fix arguments to several methods which take delegates --- vapi/libsoup-2.4.vapi | 16 +++++++------- .../packages/libsoup-2.4/libsoup-2.4.metadata | 21 +++++++++++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi index 55ef7e543..78291b415 100644 --- a/vapi/libsoup-2.4.vapi +++ b/vapi/libsoup-2.4.vapi @@ -58,8 +58,8 @@ namespace Soup { public bool covers (Soup.Message msg); public unowned string get_realm (); public void remove_path (string path); - public void set_filter (Soup.AuthDomainFilter filter, void* filter_data, GLib.DestroyNotify dnotify); - public void set_generic_auth_callback (Soup.AuthDomainGenericAuthCallback auth_callback, void* auth_data, GLib.DestroyNotify dnotify); + public void set_filter (owned Soup.AuthDomainFilter filter); + public void set_generic_auth_callback (owned Soup.AuthDomainGenericAuthCallback auth_callback); public bool try_generic_auth_callback (Soup.Message msg, string username); [NoAccessorMethod] public void* filter { get; set; } @@ -77,7 +77,7 @@ namespace Soup { public class AuthDomainBasic : Soup.AuthDomain { [CCode (type = "SoupAuthDomain*", has_construct_function = false)] public AuthDomainBasic (string optname1); - public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainBasicAuthCallback callback, GLib.DestroyNotify dnotify); + public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainBasicAuthCallback callback); [NoAccessorMethod] public void* auth_callback { get; set; } [NoAccessorMethod] @@ -88,7 +88,7 @@ namespace Soup { [CCode (type = "SoupAuthDomain*", has_construct_function = false)] public AuthDomainDigest (string optname1); public static unowned string encode_password (string username, string realm, string password); - public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainDigestAuthCallback callback, GLib.DestroyNotify dnotify); + public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainDigestAuthCallback callback); [NoAccessorMethod] public void* auth_callback { get; set; } [NoAccessorMethod] @@ -198,9 +198,9 @@ namespace Soup { public class Logger : GLib.Object, Soup.SessionFeature { [CCode (has_construct_function = false)] public Logger (Soup.LoggerLogLevel level, int max_body_size); - public void set_printer (Soup.LoggerPrinter printer, void* printer_data, GLib.DestroyNotify destroy); - public void set_request_filter (Soup.LoggerFilter request_filter, void* filter_data, GLib.DestroyNotify destroy); - public void set_response_filter (Soup.LoggerFilter response_filter, void* filter_data, GLib.DestroyNotify destroy); + public void set_printer (owned Soup.LoggerPrinter printer); + public void set_request_filter (owned Soup.LoggerFilter request_filter); + public void set_response_filter (owned Soup.LoggerFilter response_filter); } [CCode (cheader_filename = "libsoup/soup.h")] public class Message : GLib.Object { @@ -219,7 +219,7 @@ namespace Soup { public Soup.HTTPVersion get_http_version (); public unowned Soup.URI get_uri (); public bool is_keepalive (); - public void set_chunk_allocator (Soup.ChunkAllocator allocator, GLib.DestroyNotify destroy_notify); + public void set_chunk_allocator (owned Soup.ChunkAllocator allocator); public void set_flags (Soup.MessageFlags flags); public void set_http_version (Soup.HTTPVersion version); public void set_request (string content_type, Soup.MemoryUse req_use, string req_body, size_t req_length); diff --git a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata index 8bc6707f0..38a275447 100644 --- a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata +++ b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata @@ -4,10 +4,29 @@ soup_auth_is_authenticated hidden="1" soup_auth_is_for_proxy hidden="1" SoupAuthDomain:add-path hidden="1" SoupAuthDomain:remove-path hidden="1" +soup_auth_domain_set_filter.filter transfer_ownership="1" +soup_auth_domain_set_filter.filter_data hidden="1" +soup_auth_domain_set_filter.dnotify hidden="1" +soup_auth_domain_set_generic_auth_callback.auth_callback transfer_ownership="1" +soup_auth_domain_set_generic_auth_callback.auth_data hidden="1" +soup_auth_domain_set_generic_auth_callback.dnotify hidden="1" +soup_auth_domain_basic_set_auth_callback.callback transfer_ownership="1" +soup_auth_domain_basic_set_auth_callback.dnotify hidden="1" +soup_auth_domain_digest_set_auth_callback.callback transfer_ownership="1" +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_date_copy transfer_ownership="1" +soup_logger_set_printer.printer transfer_ownership="1" +soup_logger_set_printer.printer_data hidden="1" +soup_logger_set_printer.destroy hidden="1" +soup_logger_set_request_filter.request_filter transfer_ownership="1" +soup_logger_set_request_filter.filter_data hidden="1" +soup_logger_set_request_filter.destroy hidden="1" +soup_logger_set_response_filter.response_filter transfer_ownership="1" +soup_logger_set_response_filter.filter_data hidden="1" +soup_logger_set_response_filter.destroy hidden="1" SoupMessage::finished has_emitter="1" SoupMessage::got_body has_emitter="1" SoupMessage::got_chunk has_emitter="1" @@ -22,6 +41,8 @@ SoupMessage::wrote_informational has_emitter="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_server_new ellipsis="1" soup_server_add_handler.destroy hidden="1" -- 2.47.3