libsoup-2.4: Fixes for several xmlrpc-related functions

Fixes bug 576768.

diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index ae69d7380c2c058b9b2d4b431d384e6c2932d2ac..b55de2497ff3d387bfdee0f8df6d76486d137327 100644 (file)
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -537,8 +537,8 @@ namespace Soup {
        }
        [CCode (cprefix = "SOUP_HTTP_", cheader_filename = "libsoup/soup.h")]
        public enum HTTPVersion {
-               1_0,
-               1_1
+               @1_0,
+               @1_1
        }
        [CCode (cprefix = "SOUP_STATUS_", cheader_filename = "libsoup/soup.h")]
        public enum KnownStatusCode {
@@ -981,28 +981,30 @@ namespace Soup {
        public static unowned GLib.HashTable value_hash_new ();
        [CCode (cheader_filename = "libsoup/soup.h")]
        public static unowned 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);
+       public static unowned string xmlrpc_build_fault (int fault_code, string fault_format, ...);
        [CCode (cheader_filename = "libsoup/soup.h")]
        public static unowned string xmlrpc_build_method_call (string method_name, GLib.Value[] params);
        [CCode (cheader_filename = "libsoup/soup.h")]
        public static unowned string xmlrpc_build_method_response (GLib.Value value);
        [CCode (cheader_filename = "libsoup/soup.h")]
        public static GLib.Quark xmlrpc_error_quark ();
-       [CCode (cheader_filename = "libsoup/soup.h")]
-       public static bool xmlrpc_extract_method_call (string method_call, int length, out unowned string method_name);
-       [CCode (cheader_filename = "libsoup/soup.h")]
-       public static bool xmlrpc_extract_method_response (string method_response, int length, GLib.Type type) throws GLib.Error;
+       [CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+       public static bool xmlrpc_extract_method_call (string method_call, int length, out unowned string method_name, ...);
+       [CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+       public static bool xmlrpc_extract_method_response (string method_response, int length, ...) throws GLib.Error;
        [CCode (cheader_filename = "libsoup/soup.h")]
        public static GLib.Quark xmlrpc_fault_quark ();
        [CCode (cheader_filename = "libsoup/soup.h")]
        public static bool xmlrpc_parse_method_call (string method_call, int length, out unowned string method_name, out unowned GLib.ValueArray params);
        [CCode (cheader_filename = "libsoup/soup.h")]
        public static bool xmlrpc_parse_method_response (string method_response, int length, GLib.Value value) throws GLib.Error;
+       [CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+       public static unowned Soup.Message xmlrpc_request_new (string uri, string method_name, ...);
+       [PrintfFormat]
        [CCode (cheader_filename = "libsoup/soup.h")]
-       public static unowned Soup.Message xmlrpc_request_new (string uri, string method_name);
-       [CCode (cheader_filename = "libsoup/soup.h")]
-       public static void xmlrpc_set_fault (Soup.Message msg, int fault_code, string fault_format);
-       [CCode (cheader_filename = "libsoup/soup.h")]
-       public static void xmlrpc_set_response (Soup.Message msg, GLib.Type type);
+       public static void xmlrpc_set_fault (Soup.Message msg, int fault_code, string fault_format, ...);
+       [CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+       public static void xmlrpc_set_response (Soup.Message msg, ...);
 }

diff --git a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata
index d9cb2928eec3d16323e3d57acd6395dc439f07a3..b6a7d90a2b8f8842d423aa27d2bff8c0aecd2aab 100644 (file)
--- a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata
+++ b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata
@@ -28,6 +28,14 @@ soup_uri_encode.escape_extra nullable="1"
 soup_uri_copy transfer_ownership="1"
 soup_uri_to_string transfer_ownership="1"
 soup_uri_normalize 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"
+soup_xmlrpc_extract_method_response.type hidden="1"
+soup_xmlrpc_request_new ellipsis="1" sentinel="G_TYPE_INVALID"
+soup_xmlrpc_set_response ellipsis="1" sentinel="G_TYPE_INVALID"
+soup_xmlrpc_set_response.type hidden="1"
+soup_xmlrpc_set_fault ellipsis="1" printf_format="1"
 
 # unsupported
 GData name="pointer"