soup-gnome: belatedly deprecate SoupProxyResolverGNOME

There's no real reason to use SoupProxyResolverGNOME rather than
SoupProxyResolverDefault, so deprecate that too.

libsoup-gnome now consists entirely of deprecated functions.

4 files changed, 4 insertions, 50 deletions

diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
index 1273ecaa..95ff9c98 100644
--- a/docs/reference/libsoup-2.4-docs.sgml
+++ b/docs/reference/libsoup-2.4-docs.sgml
@@ -63,11 +63,6 @@
   </chapter>
 
   <chapter>
-    <title>GNOME integration</title>
-    <xi:include href="xml/soup-gnome-features.xml"/>
-  </chapter>
-
-  <chapter>
     <title>Low-level Networking API</title>
     <xi:include href="xml/soup-address.xml"/>
     <xi:include href="xml/soup-socket.xml"/>
diff --git a/docs/reference/libsoup-2.4-sections.txt b/docs/reference/libsoup-2.4-sections.txt
index f8e6dbf1..b2952fd0 100644
--- a/docs/reference/libsoup-2.4-sections.txt
+++ b/docs/reference/libsoup-2.4-sections.txt
@@ -1009,18 +1009,6 @@ soup_proxy_uri_resolver_get_type
 </SECTION>
 
 <SECTION>
-<INCLUDE>libsoup/soup-gnome.h</INCLUDE>
-<FILE>soup-gnome-features</FILE>
-SOUP_TYPE_GNOME_FEATURES_2_26
-SOUP_TYPE_PROXY_RESOLVER_GNOME
-<SUBSECTION Standard>
-soup_proxy_resolver_gnome_get_type
-soup_gnome_features_2_26_get_type
-SOUP_TYPE_PASSWORD_MANAGER_GNOME
-soup_password_manager_gnome_get_type
-</SECTION>
-
-<SECTION>
 <FILE>soup-content-sniffer</FILE>
 <TITLE>SoupContentSniffer</TITLE>
 SoupContentSniffer
diff --git a/libsoup/soup-gnome-features.c b/libsoup/soup-gnome-features.c
index 798712a2..4b40f34c 100644
--- a/libsoup/soup-gnome-features.c
+++ b/libsoup/soup-gnome-features.c
@@ -11,42 +11,11 @@
 
 #include "soup-gnome-features.h"
 
-/**
- * SOUP_TYPE_PROXY_RESOLVER_GNOME:
- *
- * This returns the #GType of a #SoupProxyURIResolver that can be used to
- * resolve HTTP proxies for GNOME applications. You can add this to
- * a session using soup_session_add_feature_by_type() or by using the
- * %SOUP_SESSION_ADD_FEATURE_BY_TYPE construct-time property.
- *
- * This feature is included in %SOUP_TYPE_GNOME_FEATURES_2_26, so if
- * you are using that feature, you do not need to include this feature
- * separately.
- *
- * Since: 2.26
- **/
-/* This is actually declared in soup-proxy-resolver-gnome now */
-
-/**
- * SOUP_TYPE_GNOME_FEATURES_2_26:
- *
- * This returns the #GType of a #SoupSessionFeature that automatically
- * adds all of the GNOME features defined for libsoup 2.26 (which is
- * just %SOUP_TYPE_PROXY_RESOLVER_GNOME).
- *
- * You can add this to a session using
- * soup_session_add_feature_by_type() or by using the
- * %SOUP_SESSION_ADD_FEATURE_BY_TYPE construct-time property.
- *
- * Since: 2.26
- **/
 GType
 soup_gnome_features_2_26_get_type (void)
 {
-	/* Eventually this needs to be a special SoupSessionFeature
-	 * class that registers other features. But for now we can
-	 * just do this:
-	 */
+	G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
 	return SOUP_TYPE_PROXY_RESOLVER_GNOME;
+	G_GNUC_END_IGNORE_DEPRECATIONS;
 }
 
diff --git a/libsoup/soup-gnome-features.h b/libsoup/soup-gnome-features.h
index 34856722..648d5043 100644
--- a/libsoup/soup-gnome-features.h
+++ b/libsoup/soup-gnome-features.h
@@ -11,10 +11,12 @@
 G_BEGIN_DECLS
 
 SOUP_AVAILABLE_IN_2_26
+SOUP_DEPRECATED_IN_2_42_FOR(SOUP_TYPE_PROXY_RESOLVER_DEFAULT)
 GType soup_proxy_resolver_gnome_get_type (void);
 #define SOUP_TYPE_PROXY_RESOLVER_GNOME (soup_proxy_resolver_gnome_get_type ())
 
 SOUP_AVAILABLE_IN_2_26
+SOUP_DEPRECATED_IN_2_42
 GType soup_gnome_features_2_26_get_type (void);
 #define SOUP_TYPE_GNOME_FEATURES_2_26 (soup_gnome_features_2_26_get_type ())