Rename LIBSOUP_DISABLE_DEPRECATED to SOUP_DISABLE_DEPRECATED

GNOME_MAINTAINER_MODE_DEFINES apparently sets
LIBSOUP_DISABLE_DEPRECATED, which is now causing various jhbuild
modules to break. "Fix" this by renaming the define (which is only
still there because gtk-doc complains if it's not). The *right* way to
get deprecation warnings/errors now is to define
SOUP_VERSION_MIN_REQUIRED.

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index adb475d..d36977e 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -13,7 +13,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 DOC_SOURCE_DIR=../../libsoup
 
 # Extra options to supply to gtkdoc-scan.
-SCAN_OPTIONS=--deprecated-guards=LIBSOUP_DISABLE_DEPRECATED --rebuild-types --ignore-decorators='SOUP_DEPRECATED\w*\s*\([^)]*\)|SOUP_DEPRECATED\w*|SOUP_AVAILABLE\w*'
+SCAN_OPTIONS=--deprecated-guards=SOUP_DISABLE_DEPRECATED --rebuild-types --ignore-decorators='SOUP_DEPRECATED\w*\s*\([^)]*\)|SOUP_DEPRECATED\w*|SOUP_AVAILABLE\w*'
 
 # Extra options to supply to gtkdoc-scangobj.
 SCANGOBJ_OPTIONS=

diff --git a/libsoup/soup-cookie-jar.h b/libsoup/soup-cookie-jar.h
index 8049736..e77f8ab 100644 (file)
--- a/libsoup/soup-cookie-jar.h
+++ b/libsoup/soup-cookie-jar.h
@@ -88,7 +88,7 @@ SoupCookieJarAcceptPolicy soup_cookie_jar_get_accept_policy           (SoupCooki
 SOUP_AVAILABLE_IN_2_40
 gboolean                  soup_cookie_jar_is_persistent               (SoupCookieJar             *jar);
 
-#ifndef LIBSOUP_DISABLE_DEPRECATED
+#ifndef SOUP_DISABLE_DEPRECATED
 SOUP_AVAILABLE_IN_2_24
 SOUP_DEPRECATED_IN_2_26
 void                      soup_cookie_jar_save                        (SoupCookieJar             *jar);

diff --git a/libsoup/soup-form.h b/libsoup/soup-form.h
index fa080c4..21b8db1 100644 (file)
--- a/libsoup/soup-form.h
+++ b/libsoup/soup-form.h
@@ -29,7 +29,7 @@ char        *soup_form_encode_datalist  (GData       **form_data_set);
 char        *soup_form_encode_valist    (const char   *first_field,
                                         va_list       args);
 
-#ifndef LIBSOUP_DISABLE_DEPRECATED
+#ifndef SOUP_DISABLE_DEPRECATED
 /* Compatibility with libsoup 2.3.0 */
 #define soup_form_decode_urlencoded      soup_form_decode
 #define soup_form_encode_urlencoded      soup_form_encode_hash

diff --git a/libsoup/soup-logger.h b/libsoup/soup-logger.h
index 7cf95c4..d84c765 100644 (file)
--- a/libsoup/soup-logger.h
+++ b/libsoup/soup-logger.h
@@ -54,7 +54,7 @@ GType       soup_logger_get_type    (void);
 SoupLogger *soup_logger_new         (SoupLoggerLogLevel  level,
                                     int                 max_body_size);
 
-#ifndef LIBSOUP_DISABLE_DEPRECATED
+#ifndef SOUP_DISABLE_DEPRECATED
 SOUP_DEPRECATED_IN_2_24_FOR(soup_session_add_feature)
 void        soup_logger_attach      (SoupLogger         *logger,
                                     SoupSession        *session);

diff --git a/libsoup/soup-message-headers.h b/libsoup/soup-message-headers.h
index 388d75b..46e5c7c 100644 (file)
--- a/libsoup/soup-message-headers.h
+++ b/libsoup/soup-message-headers.h
@@ -36,7 +36,7 @@ void                soup_message_headers_clear    (SoupMessageHeaders *hdrs);
 SOUP_AVAILABLE_IN_2_36
 void                soup_message_headers_clean_connection_headers (SoupMessageHeaders *hdrs);
 
-#ifndef LIBSOUP_DISABLE_DEPRECATED
+#ifndef SOUP_DISABLE_DEPRECATED
 SOUP_DEPRECATED_IN_2_28_FOR ("soup_message_headers_get_one or soup_message_headers_get_list")
 const char         *soup_message_headers_get      (SoupMessageHeaders *hdrs,
                                                   const char         *name);

diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h
index efcb923..23ec024 100644 (file)
--- a/libsoup/soup-message.h
+++ b/libsoup/soup-message.h
@@ -117,7 +117,7 @@ void             soup_message_set_first_party     (SoupMessage       *msg,
 typedef enum {
        SOUP_MESSAGE_NO_REDIRECT          = (1 << 1),
        SOUP_MESSAGE_CAN_REBUILD          = (1 << 2),
-#ifndef LIBSOUP_DISABLE_DEPRECATED
+#ifndef SOUP_DISABLE_DEPRECATED
        SOUP_MESSAGE_OVERWRITE_CHUNKS     = (1 << 3),
 #endif
        SOUP_MESSAGE_CONTENT_DECODED      = (1 << 4),
@@ -167,7 +167,7 @@ void           soup_message_set_redirect        (SoupMessage       *msg,
                                                 const char        *redirect_uri);
 
 /* I/O */
-#ifndef LIBSOUP_DISABLE_DEPRECATED
+#ifndef SOUP_DISABLE_DEPRECATED
 typedef SoupBuffer * (*SoupChunkAllocator)      (SoupMessage       *msg,
                                                 gsize              max_len,
                                                 gpointer           user_data);

diff --git a/libsoup/soup-proxy-resolver.h b/libsoup/soup-proxy-resolver.h
index f5933d9..8798956 100644 (file)
--- a/libsoup/soup-proxy-resolver.h
+++ b/libsoup/soup-proxy-resolver.h
@@ -10,7 +10,7 @@
 
 G_BEGIN_DECLS
 
-#ifndef LIBSOUP_DISABLE_DEPRECATED
+#ifndef SOUP_DISABLE_DEPRECATED
 
 #define SOUP_TYPE_PROXY_RESOLVER            (soup_proxy_resolver_get_type ())
 #define SOUP_PROXY_RESOLVER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), SOUP_TYPE_PROXY_RESOLVER, SoupProxyResolver))

diff --git a/libsoup/soup-session-async.h b/libsoup/soup-session-async.h
index 15b0ebf..9621763 100644 (file)
--- a/libsoup/soup-session-async.h
+++ b/libsoup/soup-session-async.h
@@ -35,7 +35,7 @@ typedef struct {
 
 GType soup_session_async_get_type (void);
 
-#ifndef LIBSOUP_DISABLE_DEPRECATED
+#ifndef SOUP_DISABLE_DEPRECATED
 SoupSession *soup_session_async_new              (void);
 SoupSession *soup_session_async_new_with_options (const char *optname1,
                                                  ...) G_GNUC_NULL_TERMINATED;

diff --git a/libsoup/soup-session-sync.h b/libsoup/soup-session-sync.h
index 0ddda22..cf81f6b 100644 (file)
--- a/libsoup/soup-session-sync.h
+++ b/libsoup/soup-session-sync.h
@@ -35,7 +35,7 @@ typedef struct {
 
 GType soup_session_sync_get_type (void);
 
-#ifndef LIBSOUP_DISABLE_DEPRECATED
+#ifndef SOUP_DISABLE_DEPRECATED
 SoupSession *soup_session_sync_new              (void);
 SoupSession *soup_session_sync_new_with_options (const char *optname1,
                                                 ...) G_GNUC_NULL_TERMINATED;

diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h
index a69c071..5d62667 100644 (file)
--- a/libsoup/soup-session.h
+++ b/libsoup/soup-session.h
@@ -110,7 +110,7 @@ void            soup_session_abort            (SoupSession           *session);
 
 GMainContext   *soup_session_get_async_context(SoupSession           *session);
 
-#ifndef LIBSOUP_DISABLE_DEPRECATED
+#ifndef SOUP_DISABLE_DEPRECATED
 /* SOUP_AVAILABLE_IN_2_30 -- this trips up gtkdoc-scan */
 SOUP_DEPRECATED_IN_2_38_FOR (soup_session_prefetch_dns)
 void            soup_session_prepare_for_uri  (SoupSession           *session,