From ddfbe30e04c8a9a8981d43b21c27b8bd8336e85b Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 28 Dec 2012 10:32:11 -0500 Subject: [PATCH] Add back LIBSOUP_DISABLE_DEPRECATED gtk-doc expects "Deprecated:" notes in docs to be matched up with some deprecation-guard #define. So even though we don't want people to use it any more, add LIBSOUP_DISABLE_DEPRECATED back. --- docs/reference/Makefile.am | 2 +- libsoup/soup-cookie-jar.h | 2 ++ libsoup/soup-logger.h | 2 ++ libsoup/soup-message-headers.h | 2 ++ libsoup/soup-message.h | 2 ++ libsoup/soup-session.h | 2 ++ tests/Makefile.am | 1 - 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 019746b..7e6c180 100644 --- 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=--rebuild-types --ignore-decorators='SOUP_DEPRECATED\w*\s*\([^)]*\)|SOUP_DEPRECATED\w*|SOUP_AVAILABLE\w*' +SCAN_OPTIONS=--deprecated-guards=LIBSOUP_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 395fbe3..8049736 100644 --- a/libsoup/soup-cookie-jar.h +++ b/libsoup/soup-cookie-jar.h @@ -88,9 +88,11 @@ 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 SOUP_AVAILABLE_IN_2_24 SOUP_DEPRECATED_IN_2_26 void soup_cookie_jar_save (SoupCookieJar *jar); +#endif G_END_DECLS diff --git a/libsoup/soup-logger.h b/libsoup/soup-logger.h index a33f3fa..7cf95c4 100644 --- a/libsoup/soup-logger.h +++ b/libsoup/soup-logger.h @@ -54,12 +54,14 @@ GType soup_logger_get_type (void); SoupLogger *soup_logger_new (SoupLoggerLogLevel level, int max_body_size); +#ifndef LIBSOUP_DISABLE_DEPRECATED SOUP_DEPRECATED_IN_2_24_FOR(soup_session_add_feature) void soup_logger_attach (SoupLogger *logger, SoupSession *session); SOUP_DEPRECATED_IN_2_24_FOR(soup_session_remove_feature) void soup_logger_detach (SoupLogger *logger, SoupSession *session); +#endif void soup_logger_set_request_filter (SoupLogger *logger, SoupLoggerFilter request_filter, diff --git a/libsoup/soup-message-headers.h b/libsoup/soup-message-headers.h index c6c43d5..388d75b 100644 --- a/libsoup/soup-message-headers.h +++ b/libsoup/soup-message-headers.h @@ -36,9 +36,11 @@ 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 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); +#endif SOUP_AVAILABLE_IN_2_28 const char *soup_message_headers_get_one (SoupMessageHeaders *hdrs, const char *name); diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h index f0fbeb3..efcb923 100644 --- a/libsoup/soup-message.h +++ b/libsoup/soup-message.h @@ -167,6 +167,7 @@ void soup_message_set_redirect (SoupMessage *msg, const char *redirect_uri); /* I/O */ +#ifndef LIBSOUP_DISABLE_DEPRECATED typedef SoupBuffer * (*SoupChunkAllocator) (SoupMessage *msg, gsize max_len, gpointer user_data); @@ -176,6 +177,7 @@ void soup_message_set_chunk_allocator (SoupMessage *msg, SoupChunkAllocator allocator, gpointer user_data, GDestroyNotify destroy_notify); +#endif SOUP_AVAILABLE_IN_2_28 void soup_message_disable_feature (SoupMessage *msg, diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h index b64fcae..40f1a8d 100644 --- a/libsoup/soup-session.h +++ b/libsoup/soup-session.h @@ -103,10 +103,12 @@ void soup_session_cancel_message (SoupSession *session, guint status_code); void soup_session_abort (SoupSession *session); +#ifndef LIBSOUP_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, SoupURI *uri); +#endif SOUP_AVAILABLE_IN_2_38 void soup_session_prefetch_dns (SoupSession *session, diff --git a/tests/Makefile.am b/tests/Makefile.am index a918405..cd132bd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ -DSRCDIR=\""$(abs_srcdir)"\" \ - -DLIBSOUP_DISABLE_DEPRECATED \ $(SOUP_MAINTAINER_FLAGS) \ $(XML_CFLAGS) \ $(GLIB_CFLAGS) -- 2.7.4