[libsoup] Remove all 2.x version macros



commit ec9ece2ec05a7aec3e3787d2398cb44b0ab2e087
Author: Patrick Griffis <pgriffis igalia com>
Date:   Wed Nov 25 11:51:17 2020 -0600

    Remove all 2.x version macros

 docs/reference/libsoup-3.0-sections.txt            | 101 ---------------------
 libsoup/auth/soup-auth-basic.h                     |   2 +-
 libsoup/auth/soup-auth-digest.h                    |   2 +-
 libsoup/auth/soup-auth-manager.h                   |   6 +-
 libsoup/auth/soup-auth-negotiate.h                 |   2 +-
 libsoup/auth/soup-auth-ntlm.h                      |   2 +-
 libsoup/auth/soup-auth.h                           |  38 ++++----
 libsoup/cache/soup-cache.h                         |  16 ++--
 libsoup/content-decoder/soup-brotli-decompressor.h |   2 +-
 libsoup/content-decoder/soup-content-decoder.h     |   2 +-
 libsoup/content-sniffer/soup-content-sniffer.h     |   8 +-
 libsoup/cookies/soup-cookie-jar-db.h               |   4 +-
 libsoup/cookies/soup-cookie-jar-text.h             |   4 +-
 libsoup/cookies/soup-cookie-jar.h                  |  30 +++---
 libsoup/cookies/soup-cookie.h                      |  66 +++++++-------
 libsoup/generate-version-header.py                 |   3 -
 libsoup/hsts/soup-hsts-enforcer-db.h               |   4 +-
 libsoup/hsts/soup-hsts-enforcer.h                  |  16 ++--
 libsoup/hsts/soup-hsts-policy.h                    |  24 ++---
 libsoup/server/soup-auth-domain-basic.h            |   6 +-
 libsoup/server/soup-auth-domain-digest.h           |   8 +-
 libsoup/server/soup-auth-domain.h                  |  22 ++---
 libsoup/server/soup-message-body.h                 |  28 +++---
 libsoup/server/soup-server.h                       |  44 ++++-----
 libsoup/soup-date-utils.h                          |   4 +-
 libsoup/soup-form.h                                |  12 +--
 libsoup/soup-headers.h                             |  30 +++---
 libsoup/soup-logger.h                              |   2 +-
 libsoup/soup-message-headers.h                     |  64 ++++++-------
 libsoup/soup-message.h                             |  42 ++++-----
 libsoup/soup-multipart-input-stream.h              |  12 +--
 libsoup/soup-multipart.h                           |  20 ++--
 libsoup/soup-session-feature.h                     |  12 +--
 libsoup/soup-session.h                             |  38 ++++----
 libsoup/soup-status.h                              |   2 +-
 libsoup/soup-tld.h                                 |   6 +-
 libsoup/soup-version.h.in                          |   8 +-
 libsoup/websocket/soup-websocket-connection.h      |  36 ++++----
 .../websocket/soup-websocket-extension-deflate.h   |   2 +-
 .../websocket/soup-websocket-extension-manager.h   |   2 +-
 libsoup/websocket/soup-websocket-extension.h       |  12 +--
 libsoup/websocket/soup-websocket.h                 |   2 +-
 42 files changed, 321 insertions(+), 425 deletions(-)
---
diff --git a/docs/reference/libsoup-3.0-sections.txt b/docs/reference/libsoup-3.0-sections.txt
index e11f838c..089649cc 100644
--- a/docs/reference/libsoup-3.0-sections.txt
+++ b/docs/reference/libsoup-3.0-sections.txt
@@ -810,111 +810,10 @@ SOUP_CHECK_VERSION
 <SUBSECTION>
 SOUP_VERSION_MIN_REQUIRED
 SOUP_VERSION_MAX_ALLOWED
-SOUP_VERSION_2_24
-SOUP_VERSION_2_26
-SOUP_VERSION_2_28
-SOUP_VERSION_2_30
-SOUP_VERSION_2_32
-SOUP_VERSION_2_34
-SOUP_VERSION_2_36
-SOUP_VERSION_2_38
-SOUP_VERSION_2_40
-SOUP_VERSION_2_42
-SOUP_VERSION_2_44
-SOUP_VERSION_2_46
-SOUP_VERSION_2_48
-SOUP_VERSION_2_50
-SOUP_VERSION_2_52
-SOUP_VERSION_2_54
-SOUP_VERSION_2_56
-SOUP_VERSION_2_58
-SOUP_VERSION_2_60
-SOUP_VERSION_2_62
-SOUP_VERSION_2_64
-SOUP_VERSION_2_66
-SOUP_VERSION_2_68
-SOUP_VERSION_2_70
-SOUP_VERSION_2_72
 SOUP_VERSION_3_0
 <SUBSECTION Private>
 SOUP_AVAILABLE_IN_ALL
-SOUP_AVAILABLE_IN_2_4
-SOUP_AVAILABLE_IN_2_24
-SOUP_AVAILABLE_IN_2_26
-SOUP_AVAILABLE_IN_2_28
-SOUP_AVAILABLE_IN_2_30
-SOUP_AVAILABLE_IN_2_32
-SOUP_AVAILABLE_IN_2_34
-SOUP_AVAILABLE_IN_2_36
-SOUP_AVAILABLE_IN_2_38
-SOUP_AVAILABLE_IN_2_40
-SOUP_AVAILABLE_IN_2_42
-SOUP_AVAILABLE_IN_2_44
-SOUP_AVAILABLE_IN_2_46
-SOUP_AVAILABLE_IN_2_48
-SOUP_AVAILABLE_IN_2_50
-SOUP_AVAILABLE_IN_2_52
-SOUP_AVAILABLE_IN_2_54
-SOUP_AVAILABLE_IN_2_56
-SOUP_AVAILABLE_IN_2_58
-SOUP_AVAILABLE_IN_2_60
-SOUP_AVAILABLE_IN_2_62
-SOUP_AVAILABLE_IN_2_64
-SOUP_AVAILABLE_IN_2_66
-SOUP_AVAILABLE_IN_2_68
-SOUP_AVAILABLE_IN_2_70
-SOUP_AVAILABLE_IN_2_72
 SOUP_AVAILABLE_IN_3_0
-SOUP_DEPRECATED_IN_2_24
-SOUP_DEPRECATED_IN_2_24_FOR
-SOUP_DEPRECATED_IN_2_26
-SOUP_DEPRECATED_IN_2_26_FOR
-SOUP_DEPRECATED_IN_2_28
-SOUP_DEPRECATED_IN_2_28_FOR
-SOUP_DEPRECATED_IN_2_30
-SOUP_DEPRECATED_IN_2_30_FOR
-SOUP_DEPRECATED_IN_2_32
-SOUP_DEPRECATED_IN_2_32_FOR
-SOUP_DEPRECATED_IN_2_34
-SOUP_DEPRECATED_IN_2_34_FOR
-SOUP_DEPRECATED_IN_2_36
-SOUP_DEPRECATED_IN_2_36_FOR
-SOUP_DEPRECATED_IN_2_38
-SOUP_DEPRECATED_IN_2_38_FOR
-SOUP_DEPRECATED_IN_2_40
-SOUP_DEPRECATED_IN_2_40_FOR
-SOUP_DEPRECATED_IN_2_42
-SOUP_DEPRECATED_IN_2_42_FOR
-SOUP_DEPRECATED_IN_2_44
-SOUP_DEPRECATED_IN_2_44_FOR
-SOUP_DEPRECATED_IN_2_46
-SOUP_DEPRECATED_IN_2_46_FOR
-SOUP_DEPRECATED_IN_2_48
-SOUP_DEPRECATED_IN_2_48_FOR
-SOUP_DEPRECATED_IN_2_50
-SOUP_DEPRECATED_IN_2_50_FOR
-SOUP_DEPRECATED_IN_2_52
-SOUP_DEPRECATED_IN_2_52_FOR
-SOUP_DEPRECATED_IN_2_54
-SOUP_DEPRECATED_IN_2_54_FOR
-SOUP_DEPRECATED_IN_2_56
-SOUP_DEPRECATED_IN_2_56_FOR
-SOUP_DEPRECATED_IN_2_58
-SOUP_DEPRECATED_IN_2_58_FOR
-SOUP_DEPRECATED_IN_2_60
-SOUP_DEPRECATED_IN_2_60_FOR
-SOUP_DEPRECATED_IN_2_62
-SOUP_DEPRECATED_IN_2_62_FOR
-SOUP_DEPRECATED_IN_2_64
-SOUP_DEPRECATED_IN_2_64_FOR
-SOUP_DEPRECATED_IN_2_66
-SOUP_DEPRECATED_IN_2_66_FOR
-SOUP_DEPRECATED_IN_2_68
-SOUP_DEPRECATED_IN_2_68_FOR
-SOUP_DEPRECATED_IN_2_70
-SOUP_DEPRECATED_IN_2_70_FOR
-SOUP_DEPRECATED_IN_2_72
-SOUP_DEPRECATED_IN_2_72_FOR
 SOUP_DEPRECATED_IN_3_0
 SOUP_DEPRECATED_IN_3_0_FOR
 SOUP_ENCODE_VERSION
diff --git a/libsoup/auth/soup-auth-basic.h b/libsoup/auth/soup-auth-basic.h
index 16383a7d..c4479aed 100644
--- a/libsoup/auth/soup-auth-basic.h
+++ b/libsoup/auth/soup-auth-basic.h
@@ -9,7 +9,7 @@
 
 G_BEGIN_DECLS
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupAuthBasic, soup_auth_basic, SOUP, AUTH_BASIC, SoupAuth)
 
 G_END_DECLS
diff --git a/libsoup/auth/soup-auth-digest.h b/libsoup/auth/soup-auth-digest.h
index f434f6e4..d70701e0 100644
--- a/libsoup/auth/soup-auth-digest.h
+++ b/libsoup/auth/soup-auth-digest.h
@@ -7,5 +7,5 @@
 
 #include "soup-auth.h"
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupAuthDigest, soup_auth_digest, SOUP, AUTH_DIGEST, SoupAuth)
diff --git a/libsoup/auth/soup-auth-manager.h b/libsoup/auth/soup-auth-manager.h
index db5756c9..67305f07 100644
--- a/libsoup/auth/soup-auth-manager.h
+++ b/libsoup/auth/soup-auth-manager.h
@@ -11,15 +11,15 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_AUTH_MANAGER (soup_auth_manager_get_type ())
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupAuthManager, soup_auth_manager, SOUP, AUTH_MANAGER, GObject)
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void  soup_auth_manager_use_auth (SoupAuthManager *manager,
                                  GUri            *uri,
                                  SoupAuth        *auth);
 
-SOUP_AVAILABLE_IN_2_58
+SOUP_AVAILABLE_IN_ALL
 void soup_auth_manager_clear_cached_credentials (SoupAuthManager *manager);
 
 G_END_DECLS
diff --git a/libsoup/auth/soup-auth-negotiate.h b/libsoup/auth/soup-auth-negotiate.h
index 9c51b02e..2ecd39b4 100644
--- a/libsoup/auth/soup-auth-negotiate.h
+++ b/libsoup/auth/soup-auth-negotiate.h
@@ -10,7 +10,7 @@
 
 G_BEGIN_DECLS
 
-SOUP_AVAILABLE_IN_2_54
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupAuthNegotiate, soup_auth_negotiate, SOUP, AUTH_NEGOTIATE, SoupConnectionAuth)
 
 G_END_DECLS
diff --git a/libsoup/auth/soup-auth-ntlm.h b/libsoup/auth/soup-auth-ntlm.h
index e7724c61..aa6d08cd 100644
--- a/libsoup/auth/soup-auth-ntlm.h
+++ b/libsoup/auth/soup-auth-ntlm.h
@@ -9,7 +9,7 @@
 
 G_BEGIN_DECLS
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupAuthNTLM, soup_auth_ntlm, SOUP, AUTH_NTLM, SoupConnectionAuth)
 
 G_END_DECLS
diff --git a/libsoup/auth/soup-auth.h b/libsoup/auth/soup-auth.h
index 9a467f47..cb02506d 100644
--- a/libsoup/auth/soup-auth.h
+++ b/libsoup/auth/soup-auth.h
@@ -11,7 +11,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_AUTH (soup_auth_get_type())
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE (SoupAuth, soup_auth, SOUP, AUTH, GObject)
 
 struct _SoupAuthClass {
@@ -43,27 +43,27 @@ struct _SoupAuthClass {
        gpointer padding[6];
 };
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupAuth   *soup_auth_new                   (GType          type,
                                             SoupMessage   *msg,
                                             const char    *auth_header);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_auth_update                (SoupAuth      *auth,
                                             SoupMessage   *msg,
                                             const char    *auth_header);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_auth_is_for_proxy          (SoupAuth      *auth);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 const char *soup_auth_get_scheme_name       (SoupAuth      *auth);
 SOUP_AVAILABLE_IN_ALL
 const char *soup_auth_get_authority         (SoupAuth      *auth);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 const char *soup_auth_get_realm             (SoupAuth      *auth);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 char       *soup_auth_get_info              (SoupAuth      *auth);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void        soup_auth_authenticate          (SoupAuth      *auth,
                                             const char    *username,
                                             const char    *password);
@@ -71,46 +71,46 @@ void        soup_auth_authenticate          (SoupAuth      *auth,
 SOUP_AVAILABLE_IN_ALL
 void        soup_auth_cancel                (SoupAuth      *auth);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_auth_is_authenticated      (SoupAuth      *auth);
 
 SOUP_AVAILABLE_IN_ALL
 gboolean    soup_auth_is_cancelled          (SoupAuth      *auth);
 
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_auth_is_ready              (SoupAuth      *auth,
                                             SoupMessage   *msg);
-SOUP_AVAILABLE_IN_2_54
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_auth_can_authenticate      (SoupAuth      *auth);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 char       *soup_auth_get_authorization     (SoupAuth      *auth, 
                                             SoupMessage   *msg);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GSList     *soup_auth_get_protection_space  (SoupAuth      *auth,
                                             GUri          *source_uri);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void        soup_auth_free_protection_space (SoupAuth      *auth,
                                             GSList        *space);
 
-SOUP_AVAILABLE_IN_2_54
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_auth_negotiate_supported   (void);
 
 #define SOUP_TYPE_AUTH_BASIC (soup_auth_basic_get_type ())
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GType soup_auth_basic_get_type (void);
 
 #define SOUP_TYPE_AUTH_DIGEST (soup_auth_digest_get_type ())
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GType soup_auth_digest_get_type (void);
 
 #define SOUP_TYPE_AUTH_NTLM (soup_auth_ntlm_get_type ())
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GType soup_auth_ntlm_get_type (void);
 
 #define SOUP_TYPE_AUTH_NEGOTIATE (soup_auth_negotiate_get_type ())
-SOUP_AVAILABLE_IN_2_54
+SOUP_AVAILABLE_IN_ALL
 GType soup_auth_negotiate_get_type (void);
 
 
diff --git a/libsoup/cache/soup-cache.h b/libsoup/cache/soup-cache.h
index 6905634e..674fa9b4 100644
--- a/libsoup/cache/soup-cache.h
+++ b/libsoup/cache/soup-cache.h
@@ -27,7 +27,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_CACHE (soup_cache_get_type ())
-SOUP_AVAILABLE_IN_2_34
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE (SoupCache, soup_cache, SOUP, CACHE, GObject)
 
 typedef enum {
@@ -57,23 +57,23 @@ struct _SoupCacheClass {
         gpointer padding[4];
 };
 
-SOUP_AVAILABLE_IN_2_34
+SOUP_AVAILABLE_IN_ALL
 SoupCache *soup_cache_new          (const char    *cache_dir,
                                    SoupCacheType  cache_type);
-SOUP_AVAILABLE_IN_2_34
+SOUP_AVAILABLE_IN_ALL
 void       soup_cache_flush        (SoupCache     *cache);
-SOUP_AVAILABLE_IN_2_34
+SOUP_AVAILABLE_IN_ALL
 void       soup_cache_clear        (SoupCache     *cache);
 
-SOUP_AVAILABLE_IN_2_34
+SOUP_AVAILABLE_IN_ALL
 void       soup_cache_dump         (SoupCache     *cache);
-SOUP_AVAILABLE_IN_2_34
+SOUP_AVAILABLE_IN_ALL
 void       soup_cache_load         (SoupCache     *cache);
 
-SOUP_AVAILABLE_IN_2_34
+SOUP_AVAILABLE_IN_ALL
 void       soup_cache_set_max_size (SoupCache     *cache,
                                    guint          max_size);
-SOUP_AVAILABLE_IN_2_34
+SOUP_AVAILABLE_IN_ALL
 guint      soup_cache_get_max_size (SoupCache     *cache);
 
 G_END_DECLS
diff --git a/libsoup/content-decoder/soup-brotli-decompressor.h 
b/libsoup/content-decoder/soup-brotli-decompressor.h
index 5c99155f..0f4f937c 100644
--- a/libsoup/content-decoder/soup-brotli-decompressor.h
+++ b/libsoup/content-decoder/soup-brotli-decompressor.h
@@ -26,7 +26,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_BROTLI_DECOMPRESSOR (soup_brotli_decompressor_get_type())
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupBrotliDecompressor, soup_brotli_decompressor, SOUP, BROTLI_DECOMPRESSOR, GObject)
 
 SoupBrotliDecompressor *soup_brotli_decompressor_new (void);
diff --git a/libsoup/content-decoder/soup-content-decoder.h b/libsoup/content-decoder/soup-content-decoder.h
index f31c4055..22bad1c8 100644
--- a/libsoup/content-decoder/soup-content-decoder.h
+++ b/libsoup/content-decoder/soup-content-decoder.h
@@ -11,7 +11,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_CONTENT_DECODER            (soup_content_decoder_get_type ())
-SOUP_AVAILABLE_IN_2_30
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupContentDecoder, soup_content_decoder, SOUP, CONTENT_DECODER, GObject)
 
 G_END_DECLS
diff --git a/libsoup/content-sniffer/soup-content-sniffer.h b/libsoup/content-sniffer/soup-content-sniffer.h
index 6931b6e4..3dfa2ddc 100644
--- a/libsoup/content-sniffer/soup-content-sniffer.h
+++ b/libsoup/content-sniffer/soup-content-sniffer.h
@@ -11,7 +11,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_CONTENT_SNIFFER (soup_content_sniffer_get_type ())
-SOUP_AVAILABLE_IN_2_28
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE (SoupContentSniffer, soup_content_sniffer, SOUP, CONTENT_SNIFFER, GObject)
 
 struct _SoupContentSnifferClass {
@@ -26,15 +26,15 @@ struct _SoupContentSnifferClass {
        gpointer padding[6];
 };
 
-SOUP_AVAILABLE_IN_2_28
+SOUP_AVAILABLE_IN_ALL
 SoupContentSniffer *soup_content_sniffer_new             (void);
 
-SOUP_AVAILABLE_IN_2_28
+SOUP_AVAILABLE_IN_ALL
 char               *soup_content_sniffer_sniff           (SoupContentSniffer  *sniffer,
                                                          SoupMessage         *msg,
                                                          GBytes              *buffer,
                                                          GHashTable         **params);
-SOUP_AVAILABLE_IN_2_28
+SOUP_AVAILABLE_IN_ALL
 gsize               soup_content_sniffer_get_buffer_size (SoupContentSniffer  *sniffer);
 
 G_END_DECLS
diff --git a/libsoup/cookies/soup-cookie-jar-db.h b/libsoup/cookies/soup-cookie-jar-db.h
index 8dbdb2e1..2d7d7b96 100644
--- a/libsoup/cookies/soup-cookie-jar-db.h
+++ b/libsoup/cookies/soup-cookie-jar-db.h
@@ -10,10 +10,10 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_COOKIE_JAR_DB (soup_cookie_jar_db_get_type ())
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupCookieJarDB, soup_cookie_jar_db, SOUP, COOKIE_JAR_DB, SoupCookieJar)
 
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 SoupCookieJar *soup_cookie_jar_db_new (const char *filename,
                                       gboolean    read_only);
 
diff --git a/libsoup/cookies/soup-cookie-jar-text.h b/libsoup/cookies/soup-cookie-jar-text.h
index c776989d..65f66d50 100644
--- a/libsoup/cookies/soup-cookie-jar-text.h
+++ b/libsoup/cookies/soup-cookie-jar-text.h
@@ -10,10 +10,10 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_COOKIE_JAR_TEXT (soup_cookie_jar_text_get_type ())
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupCookieJarText, soup_cookie_jar_text, SOUP, COOKIE_JAR_TEXT, SoupCookieJar)
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 SoupCookieJar *soup_cookie_jar_text_new (const char *filename,
                                         gboolean    read_only);
 
diff --git a/libsoup/cookies/soup-cookie-jar.h b/libsoup/cookies/soup-cookie-jar.h
index c12b3455..f0d278e3 100644
--- a/libsoup/cookies/soup-cookie-jar.h
+++ b/libsoup/cookies/soup-cookie-jar.h
@@ -10,7 +10,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_COOKIE_JAR            (soup_cookie_jar_get_type ())
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE (SoupCookieJar, soup_cookie_jar, SOUP, COOKIE_JAR, GObject)
 
 struct _SoupCookieJarClass {
@@ -35,17 +35,17 @@ typedef enum {
        SOUP_COOKIE_JAR_ACCEPT_GRANDFATHERED_THIRD_PARTY
 } SoupCookieJarAcceptPolicy;
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 SoupCookieJar *           soup_cookie_jar_new                         (void);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 char          *           soup_cookie_jar_get_cookies                 (SoupCookieJar             *jar,
                                                                       GUri                      *uri,
                                                                       gboolean                   for_http);
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 GSList        *           soup_cookie_jar_get_cookie_list             (SoupCookieJar             *jar,
                                                                       GUri                      *uri,
                                                                       gboolean                   for_http);
-SOUP_AVAILABLE_IN_2_70
+SOUP_AVAILABLE_IN_ALL
 GSList        *           soup_cookie_jar_get_cookie_list_with_same_site_info (
                                                                       SoupCookieJar             *jar,
                                                                       GUri                      *uri,
@@ -54,38 +54,38 @@ GSList        *           soup_cookie_jar_get_cookie_list_with_same_site_info (
                                                                       gboolean                   for_http,
                                                                       gboolean                   
is_safe_method,
                                                                       gboolean                   
is_top_level_navigation);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void                      soup_cookie_jar_set_cookie                  (SoupCookieJar             *jar,
                                                                       GUri                      *uri,
                                                                       const char                *cookie);
-SOUP_AVAILABLE_IN_2_30
+SOUP_AVAILABLE_IN_ALL
 void                      soup_cookie_jar_set_cookie_with_first_party (SoupCookieJar             *jar,
                                                                       GUri                      *uri,
                                                                       GUri                      *first_party,
                                                                       const char                *cookie);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void                      soup_cookie_jar_add_cookie                  (SoupCookieJar             *jar,
                                                                       SoupCookie                *cookie);
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 void                      soup_cookie_jar_add_cookie_with_first_party (SoupCookieJar             *jar,
                                                                       GUri                      *first_party,
                                                                       SoupCookie                *cookie);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 void                      soup_cookie_jar_add_cookie_full             (SoupCookieJar             *jar,
                                                                        SoupCookie                *cookie,
                                                                       GUri                      *uri,
                                                                       GUri                      
*first_party);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void                      soup_cookie_jar_delete_cookie               (SoupCookieJar             *jar,
                                                                       SoupCookie                *cookie);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 GSList        *           soup_cookie_jar_all_cookies                 (SoupCookieJar             *jar);
-SOUP_AVAILABLE_IN_2_30
+SOUP_AVAILABLE_IN_ALL
 void                      soup_cookie_jar_set_accept_policy           (SoupCookieJar             *jar,
                                                                       SoupCookieJarAcceptPolicy  policy);
-SOUP_AVAILABLE_IN_2_30
+SOUP_AVAILABLE_IN_ALL
 SoupCookieJarAcceptPolicy soup_cookie_jar_get_accept_policy           (SoupCookieJar             *jar);
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 gboolean                  soup_cookie_jar_is_persistent               (SoupCookieJar             *jar);
 
 G_END_DECLS
diff --git a/libsoup/cookies/soup-cookie.h b/libsoup/cookies/soup-cookie.h
index c5b5bd8f..c65c9814 100644
--- a/libsoup/cookies/soup-cookie.h
+++ b/libsoup/cookies/soup-cookie.h
@@ -27,7 +27,7 @@ typedef enum {
 
 typedef struct _SoupCookie SoupCookie;
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 GType soup_cookie_get_type (void);
 #define SOUP_TYPE_COOKIE (soup_cookie_get_type())
 
@@ -36,97 +36,97 @@ GType soup_cookie_get_type (void);
 #define SOUP_COOKIE_MAX_AGE_ONE_WEEK (SOUP_COOKIE_MAX_AGE_ONE_DAY * 7)
 #define SOUP_COOKIE_MAX_AGE_ONE_YEAR (SOUP_COOKIE_MAX_AGE_ONE_DAY * 365.2422)
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 SoupCookie *soup_cookie_new                     (const char  *name,
                                                 const char  *value,
                                                 const char  *domain,
                                                 const char  *path,
                                                 int          max_age);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 SoupCookie *soup_cookie_parse                   (const char  *header,
                                                 GUri        *origin);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 SoupCookie *soup_cookie_copy                    (SoupCookie  *cookie);
 
-SOUP_AVAILABLE_IN_2_32
+SOUP_AVAILABLE_IN_ALL
 const char *soup_cookie_get_name                (SoupCookie  *cookie);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookie_set_name                (SoupCookie  *cookie,
                                                 const char  *name);
-SOUP_AVAILABLE_IN_2_32
+SOUP_AVAILABLE_IN_ALL
 const char *soup_cookie_get_value               (SoupCookie  *cookie);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookie_set_value               (SoupCookie  *cookie,
                                                 const char  *value);
-SOUP_AVAILABLE_IN_2_32
+SOUP_AVAILABLE_IN_ALL
 const char *soup_cookie_get_domain              (SoupCookie  *cookie);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookie_set_domain              (SoupCookie  *cookie,
                                                 const char  *domain);
-SOUP_AVAILABLE_IN_2_32
+SOUP_AVAILABLE_IN_ALL
 const char *soup_cookie_get_path                (SoupCookie  *cookie);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookie_set_path                (SoupCookie  *cookie,
                                                 const char  *path);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookie_set_max_age             (SoupCookie  *cookie,
                                                 int          max_age);
-SOUP_AVAILABLE_IN_2_32
+SOUP_AVAILABLE_IN_ALL
 GDateTime   *soup_cookie_get_expires            (SoupCookie  *cookie);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookie_set_expires             (SoupCookie  *cookie,
                                                 GDateTime    *expires);
-SOUP_AVAILABLE_IN_2_32
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_cookie_get_secure              (SoupCookie  *cookie);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookie_set_secure              (SoupCookie  *cookie,
                                                 gboolean     secure);
-SOUP_AVAILABLE_IN_2_32
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_cookie_get_http_only           (SoupCookie  *cookie);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookie_set_http_only           (SoupCookie  *cookie,
                                                 gboolean     http_only);
 
-SOUP_AVAILABLE_IN_2_70
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookie_set_same_site_policy    (SoupCookie         *cookie,
                                                  SoupSameSitePolicy  policy);
-SOUP_AVAILABLE_IN_2_70
+SOUP_AVAILABLE_IN_ALL
 SoupSameSitePolicy soup_cookie_get_same_site_policy (SoupCookie     *cookie);
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 char       *soup_cookie_to_set_cookie_header    (SoupCookie  *cookie);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 char       *soup_cookie_to_cookie_header        (SoupCookie  *cookie);
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_cookie_applies_to_uri          (SoupCookie  *cookie,
                                                 GUri        *uri);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_cookie_equal                   (SoupCookie  *cookie1,
                                                 SoupCookie  *cookie2);
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookie_free                    (SoupCookie  *cookie);
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 GSList     *soup_cookies_from_response          (SoupMessage *msg);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 GSList     *soup_cookies_from_request           (SoupMessage *msg);
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookies_to_response            (GSList      *cookies,
                                                 SoupMessage *msg);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookies_to_request             (GSList      *cookies,
                                                 SoupMessage *msg);
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void        soup_cookies_free                   (GSList      *cookies);
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 char       *soup_cookies_to_cookie_header       (GSList      *cookies);
 
-SOUP_AVAILABLE_IN_2_30
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_cookie_domain_matches          (SoupCookie  *cookie,
                                                 const char  *host);
 
diff --git a/libsoup/generate-version-header.py b/libsoup/generate-version-header.py
index 486a9e9b..0bd91ec5 100755
--- a/libsoup/generate-version-header.py
+++ b/libsoup/generate-version-header.py
@@ -14,9 +14,6 @@ with open(input_file) as i:
     template = i.read()
 
 versions = []
-for i in range(24, 73):
-    if is_stable(i):
-        versions.append((2, i))
 
 if major == 2:
     # Specific to 3.x dev releases
diff --git a/libsoup/hsts/soup-hsts-enforcer-db.h b/libsoup/hsts/soup-hsts-enforcer-db.h
index 8e83574e..ae014411 100644
--- a/libsoup/hsts/soup-hsts-enforcer-db.h
+++ b/libsoup/hsts/soup-hsts-enforcer-db.h
@@ -11,10 +11,10 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_HSTS_ENFORCER_DB (soup_hsts_enforcer_db_get_type ())
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupHSTSEnforcerDB, soup_hsts_enforcer_db, SOUP, HSTS_ENFORCER_DB, SoupHSTSEnforcer)
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 SoupHSTSEnforcer *soup_hsts_enforcer_db_new (const char *filename);
 
 G_END_DECLS
diff --git a/libsoup/hsts/soup-hsts-enforcer.h b/libsoup/hsts/soup-hsts-enforcer.h
index adba626f..b986c505 100644
--- a/libsoup/hsts/soup-hsts-enforcer.h
+++ b/libsoup/hsts/soup-hsts-enforcer.h
@@ -11,7 +11,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_HSTS_ENFORCER (soup_hsts_enforcer_get_type ())
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE (SoupHSTSEnforcer, soup_hsts_enforcer, SOUP, HSTS_ENFORCER, GObject)
 
 /**
@@ -47,26 +47,26 @@ struct _SoupHSTSEnforcerClass {
        gpointer padding[4];
 };
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 SoupHSTSEnforcer *soup_hsts_enforcer_new                          (void);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 gboolean         soup_hsts_enforcer_is_persistent                 (SoupHSTSEnforcer *hsts_enforcer);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 gboolean         soup_hsts_enforcer_has_valid_policy              (SoupHSTSEnforcer *hsts_enforcer,
                                                                    const char       *domain);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 void             soup_hsts_enforcer_set_session_policy            (SoupHSTSEnforcer *hsts_enforcer,
                                                                    const char       *domain,
                                                                    gboolean          include_subdomains);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 void             soup_hsts_enforcer_set_policy                    (SoupHSTSEnforcer *hsts_enforcer,
                                                                    SoupHSTSPolicy   *policy);
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 GList            *soup_hsts_enforcer_get_domains                   (SoupHSTSEnforcer *hsts_enforcer,
                                                                    gboolean          session_policies);
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 GList            *soup_hsts_enforcer_get_policies                  (SoupHSTSEnforcer *hsts_enforcer,
                                                                    gboolean          session_policies);
 
diff --git a/libsoup/hsts/soup-hsts-policy.h b/libsoup/hsts/soup-hsts-policy.h
index 85d1f3d9..ae1582a3 100644
--- a/libsoup/hsts/soup-hsts-policy.h
+++ b/libsoup/hsts/soup-hsts-policy.h
@@ -12,7 +12,7 @@ G_BEGIN_DECLS
 
 typedef struct _SoupHSTSPolicy SoupHSTSPolicy;
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 GType           soup_hsts_policy_get_type (void);
 #define SOUP_TYPE_HSTS_POLICY (soup_hsts_policy_get_type())
 
@@ -23,36 +23,36 @@ GType                soup_hsts_policy_get_type (void);
  */
 #define SOUP_HSTS_POLICY_MAX_AGE_PAST (0)
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 SoupHSTSPolicy  *soup_hsts_policy_new                  (const char     *domain,
                                                         unsigned long   max_age,
                                                         gboolean        include_subdomains);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 SoupHSTSPolicy  *soup_hsts_policy_new_full             (const char     *domain,
                                                         unsigned long   max_age,
                                                         GDateTime      *expires,
                                                         gboolean        include_subdomains);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 SoupHSTSPolicy  *soup_hsts_policy_new_session_policy   (const char     *domain,
                                                         gboolean        include_subdomains);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 SoupHSTSPolicy  *soup_hsts_policy_new_from_response    (SoupMessage    *msg);
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 SoupHSTSPolicy  *soup_hsts_policy_copy                 (SoupHSTSPolicy *policy);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_hsts_policy_equal                 (SoupHSTSPolicy *policy1,
                                                         SoupHSTSPolicy *policy2);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 const char     *soup_hsts_policy_get_domain            (SoupHSTSPolicy *policy);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_hsts_policy_is_expired            (SoupHSTSPolicy *policy);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_hsts_policy_includes_subdomains   (SoupHSTSPolicy *policy);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_hsts_policy_is_session_policy     (SoupHSTSPolicy *policy);
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 void            soup_hsts_policy_free                  (SoupHSTSPolicy *policy);
 
 SOUP_AVAILABLE_IN_ALL
diff --git a/libsoup/server/soup-auth-domain-basic.h b/libsoup/server/soup-auth-domain-basic.h
index 039f4bbf..cf63a9da 100644
--- a/libsoup/server/soup-auth-domain-basic.h
+++ b/libsoup/server/soup-auth-domain-basic.h
@@ -10,10 +10,10 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_AUTH_DOMAIN_BASIC (soup_auth_domain_basic_get_type ())
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupAuthDomainBasic, soup_auth_domain_basic, SOUP, AUTH_DOMAIN_BASIC, SoupAuthDomain)
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupAuthDomain *soup_auth_domain_basic_new (const char *optname1,
                                            ...) G_GNUC_NULL_TERMINATED;
 
@@ -23,7 +23,7 @@ typedef       gboolean (*SoupAuthDomainBasicAuthCallback) (SoupAuthDomain    *domain,
                                                     const char        *password,
                                                     gpointer           user_data);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void      soup_auth_domain_basic_set_auth_callback  (SoupAuthDomain *domain,
                                                     SoupAuthDomainBasicAuthCallback callback,
                                                     gpointer        user_data,
diff --git a/libsoup/server/soup-auth-domain-digest.h b/libsoup/server/soup-auth-domain-digest.h
index bf8ec95e..1dc7fd7b 100644
--- a/libsoup/server/soup-auth-domain-digest.h
+++ b/libsoup/server/soup-auth-domain-digest.h
@@ -10,10 +10,10 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_AUTH_DOMAIN_DIGEST (soup_auth_domain_digest_get_type ())
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupAuthDomainDigest, soup_auth_domain_digest, SOUP, AUTH_DOMAIN_DIGEST, 
SoupAuthDomain)
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupAuthDomain *soup_auth_domain_digest_new (const char *optname1,
                                            ...) G_GNUC_NULL_TERMINATED;
 
@@ -22,13 +22,13 @@ typedef     char * (*SoupAuthDomainDigestAuthCallback) (SoupAuthDomain    *domain,
                                                    const char        *username,
                                                    gpointer           user_data);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void    soup_auth_domain_digest_set_auth_callback  (SoupAuthDomain *domain,
                                                    SoupAuthDomainDigestAuthCallback callback,
                                                    gpointer        user_data,
                                                    GDestroyNotify  dnotify);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 char   *soup_auth_domain_digest_encode_password    (const char     *username,
                                                    const char     *realm,
                                                    const char     *password);
diff --git a/libsoup/server/soup-auth-domain.h b/libsoup/server/soup-auth-domain.h
index ff0f64c7..4945f47b 100644
--- a/libsoup/server/soup-auth-domain.h
+++ b/libsoup/server/soup-auth-domain.h
@@ -10,7 +10,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_AUTH_DOMAIN (soup_auth_domain_get_type ())
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE (SoupAuthDomain, soup_auth_domain, SOUP, AUTH_DOMAIN, GObject)
 
 struct _SoupAuthDomainClass {
@@ -37,45 +37,45 @@ typedef gboolean (*SoupAuthDomainGenericAuthCallback) (SoupAuthDomain    *domain
                                                       const char        *username,
                                                       gpointer           user_data);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void        soup_auth_domain_add_path    (SoupAuthDomain       *domain,
                                          const char           *path);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void        soup_auth_domain_remove_path (SoupAuthDomain       *domain,
                                          const char           *path);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void        soup_auth_domain_set_filter  (SoupAuthDomain       *domain,
                                          SoupAuthDomainFilter  filter,
                                          gpointer              filter_data,
                                          GDestroyNotify        dnotify);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 const char *soup_auth_domain_get_realm   (SoupAuthDomain       *domain);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void        soup_auth_domain_set_generic_auth_callback (SoupAuthDomain *domain,
                                                        SoupAuthDomainGenericAuthCallback auth_callback,
                                                        gpointer        auth_data,
                                                        GDestroyNotify  dnotify);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_auth_domain_check_password (SoupAuthDomain    *domain,
                                             SoupServerMessage *msg,
                                             const char        *username,
                                             const char        *password);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_auth_domain_covers      (SoupAuthDomain       *domain,
                                          SoupServerMessage    *msg);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 char       *soup_auth_domain_accepts     (SoupAuthDomain       *domain,
                                          SoupServerMessage    *msg);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void        soup_auth_domain_challenge   (SoupAuthDomain       *domain,
                                          SoupServerMessage    *msg);
 
 /* protected */
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_auth_domain_try_generic_auth_callback (SoupAuthDomain    *domain,
                                                        SoupServerMessage *msg,
                                                        const char        *username);
diff --git a/libsoup/server/soup-message-body.h b/libsoup/server/soup-message-body.h
index 077f4ad3..9cdf3c7d 100644
--- a/libsoup/server/soup-message-body.h
+++ b/libsoup/server/soup-message-body.h
@@ -20,51 +20,51 @@ typedef struct {
        goffset     length;
 } SoupMessageBody;
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GType soup_message_body_get_type (void);
 #define SOUP_TYPE_MESSAGE_BODY (soup_message_body_get_type ())
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupMessageBody *soup_message_body_new           (void);
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_body_set_accumulate(SoupMessageBody *body,
                                                  gboolean         accumulate);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 gboolean         soup_message_body_get_accumulate(SoupMessageBody *body);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_body_append        (SoupMessageBody *body,
                                                  SoupMemoryUse    use,
                                                  gconstpointer    data,
                                                  gsize            length);
-SOUP_AVAILABLE_IN_2_32
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_body_append_take   (SoupMessageBody *body,
                                                  guchar          *data,
                                                  gsize            length);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_body_append_bytes (SoupMessageBody *body,
                                                  GBytes          *buffer);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_body_truncate      (SoupMessageBody *body);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_body_complete      (SoupMessageBody *body);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GBytes          *soup_message_body_flatten       (SoupMessageBody *body);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GBytes          *soup_message_body_get_chunk     (SoupMessageBody *body,
                                                  goffset          offset);
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_body_got_chunk     (SoupMessageBody *body,
                                                  GBytes          *chunk);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_body_wrote_chunk   (SoupMessageBody *body,
                                                  GBytes          *chunk);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_body_free          (SoupMessageBody *body);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (SoupMessageBody, soup_message_body_free)
diff --git a/libsoup/server/soup-server.h b/libsoup/server/soup-server.h
index 1eb7f0db..f3d238e4 100644
--- a/libsoup/server/soup-server.h
+++ b/libsoup/server/soup-server.h
@@ -12,7 +12,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_SERVER (soup_server_get_type ())
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE (SoupServer, soup_server, SOUP, SERVER, GObject)
 
 typedef enum {
@@ -37,47 +37,47 @@ struct _SoupServerClass {
        gpointer padding[6];
 };
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupServer     *soup_server_new                (const char               *optname1,
                                                ...) G_GNUC_NULL_TERMINATED;
 
-SOUP_AVAILABLE_IN_2_48
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_server_set_ssl_cert_file  (SoupServer               *server,
                                                const char               *ssl_cert_file,
                                                const char               *ssl_key_file,
                                                GError                  **error);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_server_is_https           (SoupServer               *server);
 
-SOUP_AVAILABLE_IN_2_48
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_server_listen             (SoupServer               *server,
                                                GSocketAddress           *address,
                                                SoupServerListenOptions   options,
                                                GError                  **error);
-SOUP_AVAILABLE_IN_2_48
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_server_listen_all         (SoupServer               *server,
                                                guint                     port,
                                                SoupServerListenOptions   options,
                                                GError                  **error);
-SOUP_AVAILABLE_IN_2_48
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_server_listen_local       (SoupServer               *server,
                                                guint                     port,
                                                SoupServerListenOptions   options,
                                                GError                  **error);
-SOUP_AVAILABLE_IN_2_48
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_server_listen_socket      (SoupServer               *server,
                                                GSocket                  *socket,
                                                SoupServerListenOptions   options,
                                                GError                  **error);
-SOUP_AVAILABLE_IN_2_48
+SOUP_AVAILABLE_IN_ALL
 GSList         *soup_server_get_uris           (SoupServer               *server);
-SOUP_AVAILABLE_IN_2_48
+SOUP_AVAILABLE_IN_ALL
 GSList         *soup_server_get_listeners      (SoupServer               *server);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void            soup_server_disconnect         (SoupServer               *server);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_server_accept_iostream    (SoupServer               *server,
                                                GIOStream                *stream,
                                                GSocketAddress           *local_addr,
@@ -92,13 +92,13 @@ typedef void  (*SoupServerCallback)            (SoupServer         *server,
                                                GHashTable         *query,
                                                gpointer            user_data);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void            soup_server_add_handler        (SoupServer         *server,
                                                const char         *path,
                                                SoupServerCallback  callback,
                                                gpointer            user_data,
                                                GDestroyNotify      destroy);
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 void            soup_server_add_early_handler  (SoupServer         *server,
                                                const char         *path,
                                                SoupServerCallback  callback,
@@ -110,7 +110,7 @@ typedef void (*SoupServerWebsocketCallback) (SoupServer              *server,
                                             const char              *path,
                                             SoupWebsocketConnection *connection,
                                             gpointer                 user_data);
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 void            soup_server_add_websocket_handler (SoupServer                   *server,
                                                   const char                   *path,
                                                   const char                   *origin,
@@ -118,29 +118,29 @@ void            soup_server_add_websocket_handler (SoupServer
                                                   SoupServerWebsocketCallback   callback,
                                                   gpointer                      user_data,
                                                   GDestroyNotify                destroy);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 void            soup_server_add_websocket_extension    (SoupServer *server,
                                                        GType       extension_type);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 void            soup_server_remove_websocket_extension (SoupServer *server,
                                                        GType       extension_type);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void            soup_server_remove_handler     (SoupServer         *server,
                                                const char         *path);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void            soup_server_add_auth_domain    (SoupServer         *server,
                                                SoupAuthDomain     *auth_domain);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void            soup_server_remove_auth_domain (SoupServer         *server,
                                                SoupAuthDomain     *auth_domain);
 
 /* I/O */
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void            soup_server_pause_message   (SoupServer        *server,
                                             SoupServerMessage *msg);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void            soup_server_unpause_message (SoupServer        *server,
                                             SoupServerMessage *msg);
 
diff --git a/libsoup/soup-date-utils.h b/libsoup/soup-date-utils.h
index dbd4581c..cac01ecb 100644
--- a/libsoup/soup-date-utils.h
+++ b/libsoup/soup-date-utils.h
@@ -28,11 +28,11 @@ typedef enum {
        SOUP_DATE_COOKIE,
 } SoupDateFormat;
 
-SOUP_AVAILABLE_IN_2_70
+SOUP_AVAILABLE_IN_ALL
 char           *soup_date_time_to_string            (GDateTime      *date,
                                                      SoupDateFormat  format);
 
-SOUP_AVAILABLE_IN_2_70
+SOUP_AVAILABLE_IN_ALL
 GDateTime      *soup_date_time_new_from_http_string (const char     *date_string);
 
 G_END_DECLS
diff --git a/libsoup/soup-form.h b/libsoup/soup-form.h
index c841512b..4d18c1f4 100644
--- a/libsoup/soup-form.h
+++ b/libsoup/soup-form.h
@@ -14,23 +14,23 @@ G_BEGIN_DECLS
 #define SOUP_FORM_MIME_TYPE_URLENCODED "application/x-www-form-urlencoded"
 #define SOUP_FORM_MIME_TYPE_MULTIPART  "multipart/form-data"
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GHashTable  *soup_form_decode           (const char   *encoded_form);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 GHashTable  *soup_form_decode_multipart (SoupMultipart *multipart,
                                         const char    *file_control_name,
                                         char         **filename,
                                         char         **content_type,
                                         GBytes       **file);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 char        *soup_form_encode           (const char   *first_field,
                                         ...) G_GNUC_NULL_TERMINATED;
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 char        *soup_form_encode_hash      (GHashTable   *form_data_set);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 char        *soup_form_encode_datalist  (GData       **form_data_set);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 char        *soup_form_encode_valist    (const char   *first_field,
                                         va_list       args);
 
diff --git a/libsoup/soup-headers.h b/libsoup/soup-headers.h
index 7f1a9553..bdc765f9 100644
--- a/libsoup/soup-headers.h
+++ b/libsoup/soup-headers.h
@@ -13,12 +13,12 @@ G_BEGIN_DECLS
 
 /* HTTP Header Parsing */
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_headers_parse              (const char          *str,
                                             int                  len,
                                             SoupMessageHeaders  *dest);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 guint       soup_headers_parse_request      (const char          *str,
                                             int                  len,
                                             SoupMessageHeaders  *req_headers,
@@ -26,13 +26,13 @@ guint       soup_headers_parse_request      (const char          *str,
                                             char               **req_path,
                                             SoupHTTPVersion     *ver);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_headers_parse_status_line  (const char          *status_line,
                                             SoupHTTPVersion     *ver,
                                             guint               *status_code,
                                             char               **reason_phrase);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_headers_parse_response     (const char          *str,
                                             int                  len,
                                             SoupMessageHeaders  *headers,
@@ -41,34 +41,34 @@ gboolean    soup_headers_parse_response     (const char          *str,
                                             char               **reason_phrase);
 
 /* Individual header parsing */
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GSList     *soup_header_parse_list          (const char       *header);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GSList     *soup_header_parse_quality_list  (const char       *header,
                                             GSList          **unacceptable);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void        soup_header_free_list           (GSList           *list);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_header_contains            (const char       *header,
                                             const char       *token);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GHashTable *soup_header_parse_param_list      (const char       *header);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 GHashTable *soup_header_parse_semi_param_list (const char       *header);
-SOUP_AVAILABLE_IN_2_66
+SOUP_AVAILABLE_IN_ALL
 GHashTable *soup_header_parse_param_list_strict      (const char       *header);
-SOUP_AVAILABLE_IN_2_66
+SOUP_AVAILABLE_IN_ALL
 GHashTable *soup_header_parse_semi_param_list_strict (const char       *header);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void        soup_header_free_param_list       (GHashTable       *param_list);
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void        soup_header_g_string_append_param (GString          *string,
                                               const char       *name,
                                               const char       *value);
-SOUP_AVAILABLE_IN_2_30
+SOUP_AVAILABLE_IN_ALL
 void        soup_header_g_string_append_param_quoted (GString    *string,
                                                      const char *name,
                                                      const char *value);
diff --git a/libsoup/soup-logger.h b/libsoup/soup-logger.h
index 91d6a68b..7f0defba 100644
--- a/libsoup/soup-logger.h
+++ b/libsoup/soup-logger.h
@@ -10,7 +10,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_LOGGER (soup_logger_get_type ())
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupLogger, soup_logger, SOUP, LOGGER, GObject)
 
 typedef enum {
diff --git a/libsoup/soup-message-headers.h b/libsoup/soup-message-headers.h
index 6498e3da..8612283b 100644
--- a/libsoup/soup-message-headers.h
+++ b/libsoup/soup-message-headers.h
@@ -10,7 +10,7 @@
 G_BEGIN_DECLS
 
 typedef struct _SoupMessageHeaders SoupMessageHeaders;
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GType soup_message_headers_get_type (void);
 #define SOUP_TYPE_MESSAGE_HEADERS (soup_message_headers_get_type ())
 
@@ -20,41 +20,41 @@ typedef enum {
        SOUP_MESSAGE_HEADERS_MULTIPART
 } SoupMessageHeadersType;
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupMessageHeaders *soup_message_headers_new      (SoupMessageHeadersType type);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void                soup_message_headers_free     (SoupMessageHeaders *hdrs);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void                soup_message_headers_append   (SoupMessageHeaders *hdrs,
                                                   const char         *name,
                                                   const char         *value);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void                soup_message_headers_replace  (SoupMessageHeaders *hdrs,
                                                   const char         *name,
                                                   const char         *value);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void                soup_message_headers_remove   (SoupMessageHeaders *hdrs,
                                                   const char         *name);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void                soup_message_headers_clear    (SoupMessageHeaders *hdrs);
 
-SOUP_AVAILABLE_IN_2_36
+SOUP_AVAILABLE_IN_ALL
 void                soup_message_headers_clean_connection_headers (SoupMessageHeaders *hdrs);
 
-SOUP_AVAILABLE_IN_2_28
+SOUP_AVAILABLE_IN_ALL
 const char         *soup_message_headers_get_one  (SoupMessageHeaders *hdrs,
                                                   const char         *name);
-SOUP_AVAILABLE_IN_2_28
+SOUP_AVAILABLE_IN_ALL
 const char         *soup_message_headers_get_list (SoupMessageHeaders *hdrs,
                                                   const char         *name);
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 gboolean            soup_message_headers_header_contains (SoupMessageHeaders *hdrs,
                                                          const char         *name,
                                                          const char         *token);
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 gboolean            soup_message_headers_header_equals   (SoupMessageHeaders *hdrs,
                                                          const char         *name,
                                                          const char         *value);
@@ -63,12 +63,12 @@ typedef void      (*SoupMessageHeadersForeachFunc)(const char         *name,
                                                   const char         *value,
                                                   gpointer            user_data);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void                soup_message_headers_foreach  (SoupMessageHeaders *hdrs,
                                                   SoupMessageHeadersForeachFunc func,
                                                   gpointer            user_data);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 SoupMessageHeadersType soup_message_headers_get_headers_type (SoupMessageHeaders *hdrs);
 
 typedef struct {
@@ -76,10 +76,10 @@ typedef struct {
        gpointer dummy[3];
 } SoupMessageHeadersIter;
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void                soup_message_headers_iter_init (SoupMessageHeadersIter  *iter,
                                                    SoupMessageHeaders      *hdrs);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean            soup_message_headers_iter_next (SoupMessageHeadersIter  *iter,
                                                    const char             **name,
                                                    const char             **value);
@@ -95,15 +95,15 @@ typedef enum {
        SOUP_ENCODING_BYTERANGES
 } SoupEncoding;
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupEncoding    soup_message_headers_get_encoding        (SoupMessageHeaders *hdrs);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void            soup_message_headers_set_encoding        (SoupMessageHeaders *hdrs,
                                                          SoupEncoding        encoding);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 goffset         soup_message_headers_get_content_length  (SoupMessageHeaders *hdrs);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void            soup_message_headers_set_content_length  (SoupMessageHeaders *hdrs,
                                                          goffset             content_length);
 
@@ -112,9 +112,9 @@ typedef enum {
        SOUP_EXPECTATION_CONTINUE     = (1 << 1)
 } SoupExpectation;
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupExpectation soup_message_headers_get_expectations    (SoupMessageHeaders *hdrs);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void            soup_message_headers_set_expectations    (SoupMessageHeaders *hdrs,
                                                          SoupExpectation     expectations);
 
@@ -123,48 +123,48 @@ typedef struct {
        goffset end;
 } SoupRange;
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_message_headers_get_ranges          (SoupMessageHeaders  *hdrs,
                                                          goffset              total_length,
                                                          SoupRange          **ranges,
                                                          int                 *length);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void            soup_message_headers_free_ranges         (SoupMessageHeaders  *hdrs,
                                                          SoupRange           *ranges);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void            soup_message_headers_set_ranges          (SoupMessageHeaders  *hdrs,
                                                          SoupRange           *ranges,
                                                          int                  length);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void            soup_message_headers_set_range           (SoupMessageHeaders  *hdrs,
                                                          goffset              start,
                                                          goffset              end);
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_message_headers_get_content_range   (SoupMessageHeaders  *hdrs,
                                                          goffset             *start,
                                                          goffset             *end,
                                                          goffset             *total_length);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void            soup_message_headers_set_content_range   (SoupMessageHeaders  *hdrs,
                                                          goffset              start,
                                                          goffset              end,
                                                          goffset              total_length);
 
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 const char *soup_message_headers_get_content_type     (SoupMessageHeaders  *hdrs,
                                                       GHashTable         **params);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void        soup_message_headers_set_content_type     (SoupMessageHeaders  *hdrs,
                                                       const char          *content_type,
                                                       GHashTable          *params);
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 gboolean soup_message_headers_get_content_disposition (SoupMessageHeaders  *hdrs,
                                                       char               **disposition,
                                                       GHashTable         **params);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void     soup_message_headers_set_content_disposition (SoupMessageHeaders  *hdrs,
                                                       const char          *disposition,
                                                       GHashTable          *params);
diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h
index 5540d016..2cd2603a 100644
--- a/libsoup/soup-message.h
+++ b/libsoup/soup-message.h
@@ -17,10 +17,10 @@ G_BEGIN_DECLS
 SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupMessage, soup_message, SOUP, MESSAGE, GObject)
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupMessage   *soup_message_new                   (const char        *method,
                                                   const char        *uri_string);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupMessage   *soup_message_new_from_uri          (const char        *method,
                                                   GUri              *uri);
 
@@ -43,34 +43,34 @@ void           soup_message_set_request_body_from_bytes (SoupMessage  *msg,
                                                         const char   *content_type,
                                                         GBytes       *bytes);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_set_http_version    (SoupMessage       *msg,
                                                   SoupHTTPVersion    version);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupHTTPVersion  soup_message_get_http_version    (SoupMessage       *msg);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 gboolean         soup_message_is_keepalive        (SoupMessage       *msg);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 GUri           *soup_message_get_uri             (SoupMessage       *msg);
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_set_uri             (SoupMessage       *msg,
                                                   GUri              *uri);
-SOUP_AVAILABLE_IN_2_30
+SOUP_AVAILABLE_IN_ALL
 GUri            *soup_message_get_first_party     (SoupMessage       *msg);
-SOUP_AVAILABLE_IN_2_30
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_set_first_party     (SoupMessage       *msg,
                                                   GUri              *first_party);
-SOUP_AVAILABLE_IN_2_70
+SOUP_AVAILABLE_IN_ALL
 GUri            *soup_message_get_site_for_cookies (SoupMessage      *msg);
-SOUP_AVAILABLE_IN_2_70
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_set_site_for_cookies (SoupMessage      *msg,
                                                    GUri             *site_for_cookies);
-SOUP_AVAILABLE_IN_2_70
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_set_is_top_level_navigation (SoupMessage      *msg,
                                                           gboolean          is_top_level_navigation);
-SOUP_AVAILABLE_IN_2_70
+SOUP_AVAILABLE_IN_ALL
 gboolean         soup_message_get_is_top_level_navigation (SoupMessage      *msg);
 
 typedef enum {
@@ -80,11 +80,11 @@ typedef enum {
        SOUP_MESSAGE_DO_NOT_USE_AUTH_CACHE    = (1 << 4)
 } SoupMessageFlags;
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void             soup_message_set_flags           (SoupMessage           *msg,
                                                   SoupMessageFlags       flags);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 SoupMessageFlags soup_message_get_flags           (SoupMessage           *msg);
 
 SOUP_AVAILABLE_IN_ALL
@@ -107,14 +107,14 @@ GTlsCertificateFlags soup_message_get_tls_certificate_errors (SoupMessage *msg);
 
 
 /* Specialized signal handlers */
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 guint          soup_message_add_header_handler  (SoupMessage       *msg,
                                                 const char        *signal,
                                                 const char        *header,
                                                 GCallback          callback,
                                                 gpointer           user_data);
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 guint          soup_message_add_status_code_handler (
                                                 SoupMessage       *msg,
                                                 const char        *signal,
@@ -122,11 +122,11 @@ guint          soup_message_add_status_code_handler (
                                                 GCallback          callback,
                                                 gpointer           user_data);
 
-SOUP_AVAILABLE_IN_2_28
+SOUP_AVAILABLE_IN_ALL
 void           soup_message_disable_feature     (SoupMessage       *msg,
                                                 GType              feature_type);
 
-SOUP_AVAILABLE_IN_2_72
+SOUP_AVAILABLE_IN_ALL
 gboolean       soup_message_is_feature_disabled (SoupMessage       *msg,
                                                 GType              feature_type);
 
@@ -139,12 +139,12 @@ typedef enum {
        SOUP_MESSAGE_PRIORITY_VERY_HIGH
 } SoupMessagePriority;
 
-SOUP_AVAILABLE_IN_2_44
+SOUP_AVAILABLE_IN_ALL
 void                soup_message_set_priority   (SoupMessage        *msg,
                                                 SoupMessagePriority priority);
 
 
-SOUP_AVAILABLE_IN_2_44
+SOUP_AVAILABLE_IN_ALL
 SoupMessagePriority soup_message_get_priority   (SoupMessage        *msg);
 
 SOUP_AVAILABLE_IN_ALL
diff --git a/libsoup/soup-multipart-input-stream.h b/libsoup/soup-multipart-input-stream.h
index 4e7e3d02..518e80b2 100644
--- a/libsoup/soup-multipart-input-stream.h
+++ b/libsoup/soup-multipart-input-stream.h
@@ -11,31 +11,31 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_MULTIPART_INPUT_STREAM (soup_multipart_input_stream_get_type ())
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupMultipartInputStream, soup_multipart_input_stream, SOUP, MULTIPART_INPUT_STREAM, 
GFilterInputStream)
 
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 SoupMultipartInputStream *soup_multipart_input_stream_new              (SoupMessage               *msg,
                                                                        GInputStream              
*base_stream);
 
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 GInputStream             *soup_multipart_input_stream_next_part        (SoupMultipartInputStream  *multipart,
                                                                        GCancellable              
*cancellable,
                                                                        GError                   **error);
 
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 void                      soup_multipart_input_stream_next_part_async  (SoupMultipartInputStream  *multipart,
                                                                        int                        
io_priority,
                                                                        GCancellable              
*cancellable,
                                                                        GAsyncReadyCallback        callback,
                                                                        gpointer                   data);
 
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 GInputStream             *soup_multipart_input_stream_next_part_finish (SoupMultipartInputStream  *multipart,
                                                                        GAsyncResult              *result,
                                                                        GError                   **error);
 
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 SoupMessageHeaders       *soup_multipart_input_stream_get_headers      (SoupMultipartInputStream  
*multipart);
 
 
diff --git a/libsoup/soup-multipart.h b/libsoup/soup-multipart.h
index 25462d9b..081433c4 100644
--- a/libsoup/soup-multipart.h
+++ b/libsoup/soup-multipart.h
@@ -13,46 +13,46 @@ G_BEGIN_DECLS
 
 typedef struct _SoupMultipart SoupMultipart;
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 GType soup_multipart_get_type (void);
 #define SOUP_TYPE_MULTIPART (soup_multipart_get_type ())
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 SoupMultipart *soup_multipart_new              (const char          *mime_type);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 SoupMultipart *soup_multipart_new_from_message (SoupMessageHeaders  *headers,
                                                GBytes              *body);
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 int      soup_multipart_get_length         (SoupMultipart       *multipart);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 gboolean soup_multipart_get_part           (SoupMultipart       *multipart,
                                            int                  part,
                                            SoupMessageHeaders **headers,
                                            GBytes             **body);
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void     soup_multipart_append_part        (SoupMultipart       *multipart,
                                            SoupMessageHeaders  *headers,
                                            GBytes              *body);
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void     soup_multipart_append_form_string (SoupMultipart       *multipart,
                                            const char          *control_name,
                                            const char          *data);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void     soup_multipart_append_form_file   (SoupMultipart       *multipart,
                                            const char          *control_name,
                                            const char          *filename,
                                            const char          *content_type,
                                            GBytes              *body);
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void     soup_multipart_to_message         (SoupMultipart       *multipart,
                                            SoupMessageHeaders  *dest_headers,
                                            GBytes             **dest_body);
 
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 void     soup_multipart_free               (SoupMultipart       *multipart);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (SoupMultipart, soup_multipart_free)
diff --git a/libsoup/soup-session-feature.h b/libsoup/soup-session-feature.h
index 134a79aa..b603c2a0 100644
--- a/libsoup/soup-session-feature.h
+++ b/libsoup/soup-session-feature.h
@@ -10,7 +10,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_SESSION_FEATURE (soup_session_feature_get_type ())
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_INTERFACE (SoupSessionFeature, soup_session_feature, SOUP, SESSION_FEATURE, GObject)
 
 struct _SoupSessionFeatureInterface {
@@ -36,10 +36,10 @@ struct _SoupSessionFeatureInterface {
 
 };
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void     soup_session_feature_attach         (SoupSessionFeature *feature,
                                              SoupSession        *session);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void     soup_session_feature_detach         (SoupSessionFeature *feature,
                                              SoupSession        *session);
 
@@ -50,13 +50,13 @@ SOUP_AVAILABLE_IN_ALL
 void     soup_session_feature_request_unqueued (SoupSessionFeature *feature,
                                                SoupMessage        *msg);
 
-SOUP_AVAILABLE_IN_2_34
+SOUP_AVAILABLE_IN_ALL
 gboolean soup_session_feature_add_feature    (SoupSessionFeature *feature,
                                              GType               type);
-SOUP_AVAILABLE_IN_2_34
+SOUP_AVAILABLE_IN_ALL
 gboolean soup_session_feature_remove_feature (SoupSessionFeature *feature,
                                              GType               type);
-SOUP_AVAILABLE_IN_2_34
+SOUP_AVAILABLE_IN_ALL
 gboolean soup_session_feature_has_feature    (SoupSessionFeature *feature,
                                              GType               type);
 
diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h
index e0d16a0b..7c7c1604 100644
--- a/libsoup/soup-session.h
+++ b/libsoup/soup-session.h
@@ -12,7 +12,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_SESSION soup_session_get_type ()
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupSession, soup_session, SOUP, SESSION, GObject)
 
 SOUP_AVAILABLE_IN_ALL
@@ -30,63 +30,63 @@ typedef enum {
        SOUP_SESSION_ERROR_REDIRECT_BAD_URI
 } SoupSessionError;
 
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 SoupSession    *soup_session_new              (void);
 
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 SoupSession    *soup_session_new_with_options (const char *optname1,
                                               ...) G_GNUC_NULL_TERMINATED;
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 void            soup_session_abort            (SoupSession           *session);
 
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 void            soup_session_send_async       (SoupSession           *session,
                                               SoupMessage           *msg,
                                               int                    io_priority,
                                               GCancellable          *cancellable,
                                               GAsyncReadyCallback    callback,
                                               gpointer               user_data);
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 GInputStream   *soup_session_send_finish      (SoupSession           *session,
                                               GAsyncResult          *result,
                                               GError               **error);
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 GInputStream   *soup_session_send             (SoupSession           *session,
                                               SoupMessage           *msg,
                                               GCancellable          *cancellable,
                                               GError               **error);
 
-SOUP_AVAILABLE_IN_2_38
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_session_would_redirect   (SoupSession           *session,
                                               SoupMessage           *msg);
-SOUP_AVAILABLE_IN_2_38
+SOUP_AVAILABLE_IN_ALL
 gboolean        soup_session_redirect_message (SoupSession           *session,
                                               SoupMessage           *msg,
                                               GError               **error);
 
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void                soup_session_add_feature            (SoupSession        *session,
                                                         SoupSessionFeature *feature);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void                soup_session_add_feature_by_type    (SoupSession        *session,
                                                         GType               feature_type);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void                soup_session_remove_feature         (SoupSession        *session,
                                                         SoupSessionFeature *feature);
-SOUP_AVAILABLE_IN_2_24
+SOUP_AVAILABLE_IN_ALL
 void                soup_session_remove_feature_by_type (SoupSession        *session,
                                                         GType               feature_type);
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 gboolean            soup_session_has_feature            (SoupSession        *session,
                                                         GType               feature_type);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 GSList             *soup_session_get_features           (SoupSession        *session,
                                                         GType               feature_type);
-SOUP_AVAILABLE_IN_2_26
+SOUP_AVAILABLE_IN_ALL
 SoupSessionFeature *soup_session_get_feature            (SoupSession        *session,
                                                         GType               feature_type);
-SOUP_AVAILABLE_IN_2_28
+SOUP_AVAILABLE_IN_ALL
 SoupSessionFeature *soup_session_get_feature_for_message(SoupSession        *session,
                                                         GType               feature_type,
                                                         SoupMessage        *msg);
@@ -130,7 +130,7 @@ GBytes             *soup_session_load_uri_bytes_finish  (SoupSession        *ses
                                                         char              **content_type,
                                                         GError            **error);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 void                     soup_session_websocket_connect_async  (SoupSession          *session,
                                                                SoupMessage          *msg,
                                                                const char           *origin,
@@ -140,7 +140,7 @@ void                     soup_session_websocket_connect_async  (SoupSession
                                                                GAsyncReadyCallback   callback,
                                                                gpointer              user_data);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 SoupWebsocketConnection *soup_session_websocket_connect_finish (SoupSession          *session,
                                                                GAsyncResult         *result,
                                                                GError              **error);
diff --git a/libsoup/soup-status.h b/libsoup/soup-status.h
index df4ea4ba..9a619abd 100644
--- a/libsoup/soup-status.h
+++ b/libsoup/soup-status.h
@@ -83,7 +83,7 @@ typedef enum {
         SOUP_HTTP_1_1 = 1  /*< nick=http-1-1 >*/
 } SoupHTTPVersion;
 
-SOUP_AVAILABLE_IN_2_4
+SOUP_AVAILABLE_IN_ALL
 const char *soup_status_get_phrase (guint status_code);
 
 G_END_DECLS
diff --git a/libsoup/soup-tld.h b/libsoup/soup-tld.h
index f563fac7..d900a3fb 100644
--- a/libsoup/soup-tld.h
+++ b/libsoup/soup-tld.h
@@ -9,15 +9,15 @@
 
 G_BEGIN_DECLS
 
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 const char *soup_tld_get_base_domain         (const char *hostname,
                                              GError    **error);
 
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 gboolean    soup_tld_domain_is_public_suffix (const char *domain);
 
 /* Errors */
-SOUP_AVAILABLE_IN_2_40
+SOUP_AVAILABLE_IN_ALL
 GQuark soup_tld_error_quark (void);
 #define SOUP_TLD_ERROR soup_tld_error_quark()
 
diff --git a/libsoup/soup-version.h.in b/libsoup/soup-version.h.in
index 10b5330d..97617d43 100644
--- a/libsoup/soup-version.h.in
+++ b/libsoup/soup-version.h.in
@@ -91,16 +91,16 @@ G_BEGIN_DECLS
 
 {version_attributes}
 
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 guint    soup_get_major_version (void);
 
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 guint    soup_get_minor_version (void);
 
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 guint    soup_get_micro_version (void);
 
-SOUP_AVAILABLE_IN_2_42
+SOUP_AVAILABLE_IN_ALL
 gboolean soup_check_version     (guint major,
                                 guint minor,
                                 guint micro);
diff --git a/libsoup/websocket/soup-websocket-connection.h b/libsoup/websocket/soup-websocket-connection.h
index d537168d..78431b03 100644
--- a/libsoup/websocket/soup-websocket-connection.h
+++ b/libsoup/websocket/soup-websocket-connection.h
@@ -26,7 +26,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_WEBSOCKET_CONNECTION (soup_websocket_connection_get_type ())
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupWebsocketConnection, soup_websocket_connection, SOUP, WEBSOCKET_CONNECTION, 
GObject)
 
 SOUP_AVAILABLE_IN_ALL
@@ -37,61 +37,61 @@ SoupWebsocketConnection *soup_websocket_connection_new (GIOStream
                                                        const char                   *protocol,
                                                        GList                        *extensions);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 GIOStream *         soup_websocket_connection_get_io_stream  (SoupWebsocketConnection *self);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 SoupWebsocketConnectionType soup_websocket_connection_get_connection_type (SoupWebsocketConnection *self);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 GUri *              soup_websocket_connection_get_uri        (SoupWebsocketConnection *self);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 const char *        soup_websocket_connection_get_origin     (SoupWebsocketConnection *self);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 const char *        soup_websocket_connection_get_protocol   (SoupWebsocketConnection *self);
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 GList *             soup_websocket_connection_get_extensions (SoupWebsocketConnection *self);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 SoupWebsocketState  soup_websocket_connection_get_state      (SoupWebsocketConnection *self);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 gushort             soup_websocket_connection_get_close_code (SoupWebsocketConnection *self);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 const char *        soup_websocket_connection_get_close_data (SoupWebsocketConnection *self);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 void                soup_websocket_connection_send_text      (SoupWebsocketConnection *self,
                                                              const char *text);
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 void                soup_websocket_connection_send_binary    (SoupWebsocketConnection *self,
                                                              gconstpointer data,
                                                              gsize length);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 void                soup_websocket_connection_send_message   (SoupWebsocketConnection *self,
                                                              SoupWebsocketDataType type,
                                                              GBytes *message);
 
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 void                soup_websocket_connection_close          (SoupWebsocketConnection *self,
                                                              gushort code,
                                                              const char *data);
 
-SOUP_AVAILABLE_IN_2_56
+SOUP_AVAILABLE_IN_ALL
 guint64             soup_websocket_connection_get_max_incoming_payload_size (SoupWebsocketConnection *self);
 
-SOUP_AVAILABLE_IN_2_56
+SOUP_AVAILABLE_IN_ALL
 void                soup_websocket_connection_set_max_incoming_payload_size (SoupWebsocketConnection *self,
                                                                              guint64                  
max_incoming_payload_size);
 
-SOUP_AVAILABLE_IN_2_58
+SOUP_AVAILABLE_IN_ALL
 guint               soup_websocket_connection_get_keepalive_interval (SoupWebsocketConnection *self);
 
-SOUP_AVAILABLE_IN_2_58
+SOUP_AVAILABLE_IN_ALL
 void                soup_websocket_connection_set_keepalive_interval (SoupWebsocketConnection *self,
                                                                       guint                    interval);
 
diff --git a/libsoup/websocket/soup-websocket-extension-deflate.h 
b/libsoup/websocket/soup-websocket-extension-deflate.h
index b5b4accf..986744c4 100644
--- a/libsoup/websocket/soup-websocket-extension-deflate.h
+++ b/libsoup/websocket/soup-websocket-extension-deflate.h
@@ -27,7 +27,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_WEBSOCKET_EXTENSION_DEFLATE (soup_websocket_extension_deflate_get_type ())
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupWebsocketExtensionDeflate, soup_websocket_extension_deflate, SOUP, 
WEBSOCKET_EXTENSION_DEFLATE, SoupWebsocketExtension)
 
 G_END_DECLS
diff --git a/libsoup/websocket/soup-websocket-extension-manager.h 
b/libsoup/websocket/soup-websocket-extension-manager.h
index 8c0a5f9d..69c8a74a 100644
--- a/libsoup/websocket/soup-websocket-extension-manager.h
+++ b/libsoup/websocket/soup-websocket-extension-manager.h
@@ -27,7 +27,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_WEBSOCKET_EXTENSION_MANAGER (soup_websocket_extension_manager_get_type ())
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (SoupWebsocketExtensionManager, soup_websocket_extension_manager, SOUP, 
WEBSOCKET_EXTENSION_MANAGER, GObject)
 
 G_END_DECLS
diff --git a/libsoup/websocket/soup-websocket-extension.h b/libsoup/websocket/soup-websocket-extension.h
index 7f2cfa1c..d38052eb 100644
--- a/libsoup/websocket/soup-websocket-extension.h
+++ b/libsoup/websocket/soup-websocket-extension.h
@@ -28,7 +28,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_TYPE_WEBSOCKET_EXTENSION (soup_websocket_extension_get_type ())
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE (SoupWebsocketExtension, soup_websocket_extension, SOUP, WEBSOCKET_EXTENSION, 
GObject)
 
 struct _SoupWebsocketExtensionClass {
@@ -59,23 +59,23 @@ struct _SoupWebsocketExtensionClass {
        gpointer padding[6];
 };
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 gboolean                 soup_websocket_extension_configure                (SoupWebsocketExtension     
*extension,
                                                                            SoupWebsocketConnectionType 
connection_type,
                                                                            GHashTable                 
*params,
                                                                            GError                    
**error);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 char                    *soup_websocket_extension_get_request_params       (SoupWebsocketExtension     
*extension);
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 char                    *soup_websocket_extension_get_response_params      (SoupWebsocketExtension     
*extension);
 
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 GBytes                  *soup_websocket_extension_process_outgoing_message (SoupWebsocketExtension     
*extension,
                                                                            guint8                     
*header,
                                                                            GBytes                     
*payload,
                                                                            GError                    
**error);
-SOUP_AVAILABLE_IN_2_68
+SOUP_AVAILABLE_IN_ALL
 GBytes                  *soup_websocket_extension_process_incoming_message (SoupWebsocketExtension     
*extension,
                                                                            guint8                     
*header,
                                                                            GBytes                     
*payload,
diff --git a/libsoup/websocket/soup-websocket.h b/libsoup/websocket/soup-websocket.h
index eb99f090..b7333501 100644
--- a/libsoup/websocket/soup-websocket.h
+++ b/libsoup/websocket/soup-websocket.h
@@ -25,7 +25,7 @@
 G_BEGIN_DECLS
 
 #define SOUP_WEBSOCKET_ERROR (soup_websocket_error_quark ())
-SOUP_AVAILABLE_IN_2_50
+SOUP_AVAILABLE_IN_ALL
 GQuark soup_websocket_error_quark (void) G_GNUC_CONST;
 
 typedef enum {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]