libsoup-2.4: Keep using SOUP_STATUS_CODE_ cprefix for KnownStatusCode

This preserves backwards compatibility with <= 2.42.*

diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index 334a8add96d57e827938a0a0f9b6fc7514cab637..5fef6064506ea705eec4924d8124e7931fa70de3 100644 (file)
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -930,7 +930,8 @@ namespace Soup {
                @1_0,
                @1_1
        }
-       [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_KNOWN_STATUS_CODE_", type_id = "soup_known_status_code_get_type ()")]
+       [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_STATUS_CODE_", type_id = "soup_known_status_code_get_type ()")]
+       [Deprecated (replacement = "StatusCode", since = "vala-0.22")]
        public enum KnownStatusCode {
                NONE,
                CANCELLED,
@@ -1524,8 +1525,10 @@ namespace Soup {
        [Deprecated (replacement = "SSLError.quark", since = "vala-0.14")]
        public static GLib.Quark ssl_error_quark ();
        [CCode (cheader_filename = "libsoup/soup.h")]
+       [Deprecated (replacement = "StatusCode.get_phrase", since = "vala-0.22")]
        public static unowned string status_get_phrase (uint status_code);
        [CCode (cheader_filename = "libsoup/soup.h")]
+       [Deprecated (replacement = "StatusCode.proxify", since = "vala-0.22")]
        public static uint status_proxify (uint status_code);
        [CCode (cheader_filename = "libsoup/soup.h")]
        public static bool str_case_equal (void* v1, void* v2);

diff --git a/vapi/metadata/Soup-2.4-custom.vala b/vapi/metadata/Soup-2.4-custom.vala
index bcc3cd455fcbf7842b073f9afc10e82135aab0cf..f97d575793f87c0c2641dcecfdde7cbbd8b6ecbb 100644 (file)
--- a/vapi/metadata/Soup-2.4-custom.vala
+++ b/vapi/metadata/Soup-2.4-custom.vala
@@ -92,8 +92,77 @@ namespace Soup {
        [Deprecated (since = "vala-0.14", replacement = "SSLError.quark")]
        public static GLib.Quark ssl_error_quark ();
 
+       [Deprecated (since = "vala-0.22", replacement = "StatusCode.get_phrase")]
        public static unowned string status_get_phrase (uint status_code);
+       [Deprecated (since = "vala-0.22", replacement = "StatusCode.proxify")]
        public static uint status_proxify (uint status_code);
+       [Deprecated (since = "vala-0.22", replacement = "StatusCode")]
+       [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_STATUS_CODE_", type_id = "soup_known_status_code_get_type ()")]
+       public enum KnownStatusCode {
+               NONE,
+               CANCELLED,
+               CANT_RESOLVE,
+               CANT_RESOLVE_PROXY,
+               CANT_CONNECT,
+               CANT_CONNECT_PROXY,
+               SSL_FAILED,
+               IO_ERROR,
+               MALFORMED,
+               TRY_AGAIN,
+               TOO_MANY_REDIRECTS,
+               TLS_FAILED,
+               CONTINUE,
+               SWITCHING_PROTOCOLS,
+               PROCESSING,
+               OK,
+               CREATED,
+               ACCEPTED,
+               NON_AUTHORITATIVE,
+               NO_CONTENT,
+               RESET_CONTENT,
+               PARTIAL_CONTENT,
+               MULTI_STATUS,
+               MULTIPLE_CHOICES,
+               MOVED_PERMANENTLY,
+               FOUND,
+               MOVED_TEMPORARILY,
+               SEE_OTHER,
+               NOT_MODIFIED,
+               USE_PROXY,
+               NOT_APPEARING_IN_THIS_PROTOCOL,
+               TEMPORARY_REDIRECT,
+               BAD_REQUEST,
+               UNAUTHORIZED,
+               PAYMENT_REQUIRED,
+               FORBIDDEN,
+               NOT_FOUND,
+               METHOD_NOT_ALLOWED,
+               NOT_ACCEPTABLE,
+               PROXY_AUTHENTICATION_REQUIRED,
+               PROXY_UNAUTHORIZED,
+               REQUEST_TIMEOUT,
+               CONFLICT,
+               GONE,
+               LENGTH_REQUIRED,
+               PRECONDITION_FAILED,
+               REQUEST_ENTITY_TOO_LARGE,
+               REQUEST_URI_TOO_LONG,
+               UNSUPPORTED_MEDIA_TYPE,
+               REQUESTED_RANGE_NOT_SATISFIABLE,
+               INVALID_RANGE,
+               EXPECTATION_FAILED,
+               UNPROCESSABLE_ENTITY,
+               LOCKED,
+               FAILED_DEPENDENCY,
+               INTERNAL_SERVER_ERROR,
+               NOT_IMPLEMENTED,
+               BAD_GATEWAY,
+               SERVICE_UNAVAILABLE,
+               GATEWAY_TIMEOUT,
+               HTTP_VERSION_NOT_SUPPORTED,
+               INSUFFICIENT_STORAGE,
+               NOT_EXTENDED
+       }
 
        public delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3, Soup.Address p4);
 }

diff --git a/vapi/metadata/Soup-2.4.metadata b/vapi/metadata/Soup-2.4.metadata
index 667595ee3762bd4adc5a9245f5d54ad4681ae6ae..7f63bb81526a5bad9a5fc621280bea8ee5039fb9 100644 (file)
--- a/vapi/metadata/Soup-2.4.metadata
+++ b/vapi/metadata/Soup-2.4.metadata
@@ -12,6 +12,7 @@ xmlrpc_set_response.type skip
 HTTPVersion.http_* name="http_(.+)"
 
 // Backwards compatibility
+KnownStatusCode skip
 Requester deprecated_since="2.42" replacement="Session"
 Requester
   .request* skip=false unowned=false