[libsoup/wip/new-master: 18/57] Remove deprecated proxy APIs




commit a0b6cad9261c6b0dc236cce032b5e4d446852c92
Author: Patrick Griffis <pgriffis igalia com>
Date:   Thu Feb 13 17:26:17 2020 -0800

    Remove deprecated proxy APIs

 docs/reference/libsoup-2.4-sections.txt |  16 --
 examples/get.c                          |   5 +-
 libsoup/Soup-2.4.metadata               |   5 -
 libsoup/meson.build                     |   8 -
 libsoup/soup-proxy-resolver-default.c   | 261 --------------------------------
 libsoup/soup-proxy-resolver-default.h   |  31 ----
 libsoup/soup-proxy-resolver-gnome.c     |  58 -------
 libsoup/soup-proxy-resolver-gnome.h     |  25 ---
 libsoup/soup-proxy-resolver-wrapper.c   | 167 --------------------
 libsoup/soup-proxy-resolver-wrapper.h   |  34 -----
 libsoup/soup-proxy-resolver.c           |  89 -----------
 libsoup/soup-proxy-resolver.h           |  65 --------
 libsoup/soup-proxy-uri-resolver.c       | 111 --------------
 libsoup/soup-proxy-uri-resolver.h       |  67 --------
 libsoup/soup-session-private.h          |   1 -
 libsoup/soup-session.c                  |  89 +----------
 libsoup/soup-session.h                  |   1 -
 libsoup/soup.h                          |   3 -
 tests/connection-test.c                 |  28 ++--
 tests/proxy-test.c                      |  13 +-
 tests/server-test.c                     |  12 +-
 tests/session-test.c                    |  31 ----
 22 files changed, 34 insertions(+), 1086 deletions(-)
---
diff --git a/docs/reference/libsoup-2.4-sections.txt b/docs/reference/libsoup-2.4-sections.txt
index 87017b2f..fe00bf3b 100644
--- a/docs/reference/libsoup-2.4-sections.txt
+++ b/docs/reference/libsoup-2.4-sections.txt
@@ -464,7 +464,6 @@ SoupSessionConnectProgressCallback
 soup_session_connect_async
 soup_session_connect_finish
 <SUBSECTION>
-SOUP_SESSION_PROXY_URI
 SOUP_SESSION_PROXY_RESOLVER
 SOUP_SESSION_MAX_CONNS
 SOUP_SESSION_MAX_CONNS_PER_HOST
@@ -1089,21 +1088,6 @@ SoupContentDecoderPrivate
 soup_content_decoder_get_type
 </SECTION>
 
-<SECTION>
-<FILE>soup-proxy-resolver-default</FILE>
-<TITLE>SoupProxyResolverDefault</TITLE>
-SoupProxyResolverDefault
-<SUBSECTION Standard>
-soup_proxy_resolver_default_get_type
-SoupProxyResolverDefaultClass
-SOUP_TYPE_PROXY_RESOLVER_DEFAULT
-SOUP_PROXY_RESOLVER_DEFAULT
-SOUP_PROXY_RESOLVER_DEFAULT_CLASS
-SOUP_PROXY_RESOLVER_DEFAULT_GET_CLASS
-SOUP_IS_PROXY_RESOLVER_DEFAULT
-SOUP_IS_PROXY_RESOLVER_DEFAULT_CLASS
-</SECTION>
-
 <SECTION>
 <FILE>soup-request</FILE>
 <TITLE>SoupRequest</TITLE>
diff --git a/examples/get.c b/examples/get.c
index 00dbbddf..96ee67c2 100644
--- a/examples/get.c
+++ b/examples/get.c
@@ -263,6 +263,7 @@ main (int argc, char **argv)
        }
 
        if (proxy) {
+               GProxyResolver *resolver;
                proxy_uri = soup_uri_new (proxy);
                if (!proxy_uri) {
                        g_printerr ("Could not parse '%s' as URI\n",
@@ -270,10 +271,12 @@ main (int argc, char **argv)
                        exit (1);
                }
 
+               resolver = g_simple_proxy_resolver_new (proxy, NULL);
                g_object_set (G_OBJECT (session),
-                             SOUP_SESSION_PROXY_URI, proxy_uri,
+                             SOUP_SESSION_PROXY_RESOLVER, resolver,
                              NULL);
                soup_uri_free (proxy_uri);
+               g_object_unref (resolver);
        }
 
 #ifdef LIBSOUP_HAVE_GSSAPI
diff --git a/libsoup/Soup-2.4.metadata b/libsoup/Soup-2.4.metadata
index c5c7450f..0c247f32 100644
--- a/libsoup/Soup-2.4.metadata
+++ b/libsoup/Soup-2.4.metadata
@@ -10,10 +10,6 @@ XMLRPCFault errordomain parent="Soup.XMLRPC" name="Fault"
 XMLRPCError parent="Soup.XMLRPC" name="Error"
 HTTPVersion.http_* name="http_(.+)"
 
-// Backwards compatibility
-Requester deprecated_since="2.42" replacement="Session"
-ProxyResolver deprecated_since="2.28" replacement="ProxyURIResolver"
-
 // Report upstream
 add_* skip=false type="unowned GLib.TimeoutSource"
 Auth
@@ -45,7 +41,6 @@ Socket
 URI
        .set_query_from_fields skip=false
 // uri_host_*.* type="Soup.URI"
-ProxyURIResolverCallback.user_data skip
 xmlrpc_* skip=false
 
 // Not enough GIR information
diff --git a/libsoup/meson.build b/libsoup/meson.build
index eef8d4ad..d0b8c645 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -58,10 +58,6 @@ soup_sources = [
   'soup-multipart.c',
   'soup-multipart-input-stream.c',
   'soup-path-map.c',
-  'soup-proxy-resolver.c',
-  'soup-proxy-resolver-default.c',
-  'soup-proxy-resolver-wrapper.c',
-  'soup-proxy-uri-resolver.c',
   'soup-request.c',
   'soup-request-data.c',
   'soup-request-file.c',
@@ -109,7 +105,6 @@ soup_headers = [
   'soup-message-queue.h',
   'soup-misc-private.h',
   'soup-path-map.h',
-  'soup-proxy-resolver-wrapper.h',
   'soup-session-private.h',
   'soup-socket-private.h',
   'soup-websocket-extension-manager-private.h',
@@ -145,9 +140,6 @@ soup_introspection_headers = [
   'soup-multipart.h',
   'soup-multipart-input-stream.h',
   'soup-portability.h',
-  'soup-proxy-resolver.h',
-  'soup-proxy-resolver-default.h',
-  'soup-proxy-uri-resolver.h',
   'soup-request.h',
   'soup-request-data.h',
   'soup-request-file.h',
diff --git a/libsoup/soup-session-private.h b/libsoup/soup-session-private.h
index 62478562..057b3e48 100644
--- a/libsoup/soup-session-private.h
+++ b/libsoup/soup-session-private.h
@@ -8,7 +8,6 @@
 
 #include "soup-session.h"
 #include "soup-message-private.h"
-#include "soup-proxy-uri-resolver.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 8d476394..bc2adc8a 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -19,7 +19,6 @@
 #include "soup-message-private.h"
 #include "soup-misc-private.h"
 #include "soup-message-queue.h"
-#include "soup-proxy-resolver-wrapper.h"
 #include "soup-session-private.h"
 #include "soup-socket-private.h"
 #include "soup-websocket.h"
@@ -184,7 +183,6 @@ static guint signals[LAST_SIGNAL] = { 0 };
 enum {
        PROP_0,
 
-       PROP_PROXY_URI,
        PROP_PROXY_RESOLVER,
        PROP_MAX_CONNS,
        PROP_MAX_CONNS_PER_HOST,
@@ -538,14 +536,9 @@ set_aliases (char ***variable, char **value)
 
 static void
 set_proxy_resolver (SoupSession *session, SoupURI *uri,
-                   SoupProxyURIResolver *soup_resolver,
                    GProxyResolver *g_resolver)
 {
        SoupSessionPrivate *priv = soup_session_get_instance_private (session);
-
-       G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-       soup_session_remove_feature_by_type (session, SOUP_TYPE_PROXY_URI_RESOLVER);
-       G_GNUC_END_IGNORE_DEPRECATIONS;
        g_clear_object (&priv->proxy_resolver);
        g_clear_pointer (&priv->proxy_uri, soup_uri_free);
        priv->proxy_use_default = FALSE;
@@ -557,13 +550,6 @@ set_proxy_resolver (SoupSession *session, SoupURI *uri,
                uri_string = soup_uri_to_string_internal (uri, FALSE, TRUE, TRUE);
                priv->proxy_resolver = g_simple_proxy_resolver_new (uri_string, NULL);
                g_free (uri_string);
-       } else if (soup_resolver) {
-               G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-               if (SOUP_IS_PROXY_RESOLVER_DEFAULT (soup_resolver))
-                       priv->proxy_resolver = g_object_ref (g_proxy_resolver_get_default ());
-               else
-                       priv->proxy_resolver = soup_proxy_resolver_wrapper_new (soup_resolver);
-               G_GNUC_END_IGNORE_DEPRECATIONS;
        } else if (g_resolver)
                priv->proxy_resolver = g_object_ref (g_resolver);
 }
@@ -583,14 +569,8 @@ soup_session_set_property (GObject *object, guint prop_id,
                priv->local_addr = g_value_dup_object (value);
                socket_props_changed = TRUE;
                break;
-       case PROP_PROXY_URI:
-               set_proxy_resolver (session, g_value_get_boxed (value),
-                                   NULL, NULL);
-               soup_session_abort (session);
-               socket_props_changed = TRUE;
-               break;
        case PROP_PROXY_RESOLVER:
-               set_proxy_resolver (session, NULL, NULL,
+               set_proxy_resolver (session, NULL,
                                    g_value_get_object (value));
                socket_props_changed = TRUE;
                break;
@@ -719,9 +699,6 @@ soup_session_get_property (GObject *object, guint prop_id,
        case PROP_LOCAL_ADDRESS:
                g_value_set_object (value, priv->local_addr);
                break;
-       case PROP_PROXY_URI:
-               g_value_set_boxed (value, priv->proxy_uri);
-               break;
        case PROP_PROXY_RESOLVER:
                g_mutex_lock (&priv->conn_lock);
                ensure_socket_props (session);
@@ -2572,15 +2549,6 @@ soup_session_add_feature (SoupSession *session, SoupSessionFeature *feature)
        g_return_if_fail (SOUP_IS_SESSION_FEATURE (feature));
 
        priv = soup_session_get_instance_private (session);
-
-       G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-       if (SOUP_IS_PROXY_URI_RESOLVER (feature)) {
-               set_proxy_resolver (session, NULL,
-                                   SOUP_PROXY_URI_RESOLVER (feature),
-                                   NULL);
-       }
-       G_GNUC_END_IGNORE_DEPRECATIONS;
-
        priv->features = g_slist_prepend (priv->features, g_object_ref (feature));
        g_hash_table_remove_all (priv->features_cache);
        soup_session_feature_attach (feature, session);
@@ -2666,15 +2634,6 @@ soup_session_remove_feature (SoupSession *session, SoupSessionFeature *feature)
                priv->features = g_slist_remove (priv->features, feature);
                g_hash_table_remove_all (priv->features_cache);
                soup_session_feature_detach (feature, session);
-
-               G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-               if (SOUP_IS_PROXY_URI_RESOLVER (feature)) {
-                       if (SOUP_IS_PROXY_RESOLVER_WRAPPER (priv->proxy_resolver) &&
-                           SOUP_PROXY_RESOLVER_WRAPPER (priv->proxy_resolver)->soup_resolver == 
SOUP_PROXY_URI_RESOLVER (feature))
-                               g_clear_object (&priv->proxy_resolver);
-               }
-               G_GNUC_END_IGNORE_DEPRECATIONS;
-
                g_object_unref (feature);
        }
 }
@@ -2709,10 +2668,6 @@ soup_session_remove_feature_by_type (SoupSession *session, GType feature_type)
                                goto restart;
                        }
                }
-               G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-               if (g_type_is_a (feature_type, SOUP_TYPE_PROXY_URI_RESOLVER))
-                       priv->proxy_use_default = FALSE;
-               G_GNUC_END_IGNORE_DEPRECATIONS;
        } else if (g_type_is_a (feature_type, SOUP_TYPE_REQUEST)) {
                SoupRequestClass *request_class;
                int i;
@@ -3071,50 +3026,10 @@ soup_session_class_init (SoupSessionClass *session_class)
 
 
        /* properties */
-       /**
-        * SoupSession:proxy-uri:
-        *
-        * A proxy to use for all http and https requests in this
-        * session. Setting this will clear the
-        * #SoupSession:proxy-resolver property, and remove any
-        * <type>SoupProxyURIResolver</type> features that have been
-        * added to the session. Setting this property will also
-        * cancel all currently pending messages.
-        *
-        * Note that #SoupSession will normally handle looking up the
-        * user's proxy settings for you; you should only use
-        * #SoupSession:proxy-uri if you need to override the user's
-        * normal proxy settings.
-        *
-        * Also note that this proxy will be used for
-        * <emphasis>all</emphasis> requests; even requests to
-        * <literal>localhost</literal>. If you need more control over
-        * proxies, you can create a #GSimpleProxyResolver and set the
-        * #SoupSession:proxy-resolver property.
-        *
-        * Deprecated: 2.70: Use SoupSession:proxy-resolver along with #GSimpleProxyResolver.
-        */
-       /**
-        * SOUP_SESSION_PROXY_URI:
-        *
-        * Alias for the #SoupSession:proxy-uri property, qv.
-        **/
-       g_object_class_install_property (
-               object_class, PROP_PROXY_URI,
-               g_param_spec_boxed (SOUP_SESSION_PROXY_URI,
-                                   "Proxy URI",
-                                   "The HTTP Proxy to use for this session",
-                                   SOUP_TYPE_URI,
-                                   G_PARAM_READWRITE |
-                                   G_PARAM_STATIC_STRINGS |
-                                   G_PARAM_DEPRECATED));
        /**
         * SoupSession:proxy-resolver:
         *
-        * A #GProxyResolver to use with this session. Setting this
-        * will clear the #SoupSession:proxy-uri property, and remove
-        * any <type>SoupProxyURIResolver</type> features that have
-        * been added to the session.
+        * A #GProxyResolver to use with this session.
         *
         * By default, in a plain #SoupSession, this is set to the
         * default #GProxyResolver, but you can set it to %NULL if you
diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h
index 92d9ede2..f666afcb 100644
--- a/libsoup/soup-session.h
+++ b/libsoup/soup-session.h
@@ -63,7 +63,6 @@ SOUP_AVAILABLE_IN_2_42
 GType soup_session_get_type (void);
 
 #define SOUP_SESSION_LOCAL_ADDRESS          "local-address"
-#define SOUP_SESSION_PROXY_URI              "proxy-uri"
 #define SOUP_SESSION_PROXY_RESOLVER         "proxy-resolver"
 #define SOUP_SESSION_MAX_CONNS              "max-conns"
 #define SOUP_SESSION_MAX_CONNS_PER_HOST     "max-conns-per-host"
diff --git a/libsoup/soup.h b/libsoup/soup.h
index 55f06ee7..b908c389 100644
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@ -38,9 +38,6 @@ extern "C" {
 #include <libsoup/soup-misc.h>
 #include <libsoup/soup-multipart.h>
 #include <libsoup/soup-multipart-input-stream.h>
-#include <libsoup/soup-proxy-resolver.h>
-#include <libsoup/soup-proxy-resolver-default.h>
-#include <libsoup/soup-proxy-uri-resolver.h>
 #include <libsoup/soup-request.h>
 #include <libsoup/soup-request-data.h>
 #include <libsoup/soup-request-file.h>
diff --git a/tests/connection-test.c b/tests/connection-test.c
index 7e430801..0bd19e2f 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -813,7 +813,7 @@ static void
 do_connection_state_test_for_session (SoupSession *session)
 {
        SoupConnectionState state;
-       SoupURI *proxy_uri;
+       GProxyResolver *resolver;
 
        g_signal_connect (session, "connection-created",
                          G_CALLBACK (connection_created),
@@ -828,11 +828,11 @@ do_connection_state_test_for_session (SoupSession *session)
        } else
                debug_printf (1, "    https -- SKIPPING\n");
 
-       proxy_uri = soup_uri_new (HTTP_PROXY);
+       resolver = g_simple_proxy_resolver_new (HTTP_PROXY, NULL);
        g_object_set (G_OBJECT (session),
-                     SOUP_SESSION_PROXY_URI, proxy_uri,
+                     SOUP_SESSION_PROXY_RESOLVER, resolver,
                      NULL);
-       soup_uri_free (proxy_uri);
+       g_object_unref (resolver);
 
        debug_printf (1, "    http with proxy\n");
        do_one_connection_state_test (session, HTTP_SERVER);
@@ -960,7 +960,7 @@ do_one_connection_event_test (SoupSession *session, const char *uri,
 static void
 do_connection_event_test_for_session (SoupSession *session)
 {
-       SoupURI *proxy_uri;
+       GProxyResolver *resolver;
 
        debug_printf (1, "    http\n");
        do_one_connection_event_test (session, HTTP_SERVER, "rRcCx");
@@ -971,11 +971,11 @@ do_connection_event_test_for_session (SoupSession *session)
        } else
                debug_printf (1, "    https -- SKIPPING\n");
 
-       proxy_uri = soup_uri_new (HTTP_PROXY);
+       resolver = g_simple_proxy_resolver_new (HTTP_PROXY, NULL);
        g_object_set (G_OBJECT (session),
-                     SOUP_SESSION_PROXY_URI, proxy_uri,
+                     SOUP_SESSION_PROXY_RESOLVER, resolver,
                      NULL);
-       soup_uri_free (proxy_uri);
+       g_object_unref (resolver);
 
        debug_printf (1, "    http with proxy\n");
        do_one_connection_event_test (session, HTTP_SERVER, "rRcCx");
@@ -1099,7 +1099,7 @@ do_connection_connect_test (void)
         SoupURI *wss_uri = NULL;
         SoupURI *file_uri;
         SoupURI *wrong_http_uri;
-        SoupURI *proxy_uri;
+       GProxyResolver *resolver;
 
         SOUP_TEST_SKIP_IF_NO_APACHE;
 
@@ -1147,10 +1147,11 @@ do_connection_connect_test (void)
                                              G_IO_ERROR, G_IO_ERROR_CONNECTION_REFUSED,
                                              "rRcr"); /* FIXME: why r again? GLib bug? */
 
-        proxy_uri = soup_uri_new (HTTP_PROXY);
-        g_object_set (G_OBJECT (session),
-                      SOUP_SESSION_PROXY_URI, proxy_uri,
-                      NULL);
+       resolver = g_simple_proxy_resolver_new (HTTP_PROXY, NULL);
+       g_object_set (G_OBJECT (session),
+                     SOUP_SESSION_PROXY_RESOLVER, resolver,
+                     NULL);
+       g_object_unref (resolver);
 
         debug_printf (1, "    http with proxy\n");
         do_one_connection_connect_test (session, http_uri,
@@ -1182,7 +1183,6 @@ do_connection_connect_test (void)
                 soup_uri_free (wss_uri);
         soup_uri_free (file_uri);
         soup_uri_free (wrong_http_uri);
-        soup_uri_free (proxy_uri);
 
         soup_test_session_abort_unref (session);
 }
diff --git a/tests/proxy-test.c b/tests/proxy-test.c
index c9be7894..21d99366 100644
--- a/tests/proxy-test.c
+++ b/tests/proxy-test.c
@@ -1,5 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 
+#include <gio/gio.h>
 #include "test-utils.h"
 
 typedef struct {
@@ -265,16 +266,14 @@ do_proxy_fragment_test (gconstpointer data)
 {
        SoupURI *base_uri = (SoupURI *)data;
        SoupSession *session;
-       SoupURI *proxy_uri, *req_uri;
+       SoupURI *req_uri;
        SoupMessage *msg;
 
        SOUP_TEST_SKIP_IF_NO_APACHE;
 
-       proxy_uri = soup_uri_new (proxies[SIMPLE_PROXY]);
        session = soup_test_session_new (SOUP_TYPE_SESSION_ASYNC,
-                                        SOUP_SESSION_PROXY_URI, proxy_uri,
+                                        SOUP_SESSION_PROXY_RESOLVER, proxy_resolvers[SIMPLE_PROXY],
                                         NULL);
-       soup_uri_free (proxy_uri);
 
        req_uri = soup_uri_new_with_base (base_uri, "/#foo");
        msg = soup_message_new_from_uri (SOUP_METHOD_GET, req_uri);
@@ -291,7 +290,7 @@ static void
 do_proxy_redirect_test (void)
 {
        SoupSession *session;
-       SoupURI *proxy_uri, *req_uri, *new_uri;
+       SoupURI *req_uri, *new_uri;
        SoupMessage *msg;
 
        g_test_bug ("631368");
@@ -299,11 +298,9 @@ do_proxy_redirect_test (void)
        SOUP_TEST_SKIP_IF_NO_APACHE;
        SOUP_TEST_SKIP_IF_NO_TLS;
 
-       proxy_uri = soup_uri_new (proxies[SIMPLE_PROXY]);
        session = soup_test_session_new (SOUP_TYPE_SESSION_ASYNC,
-                                        SOUP_SESSION_PROXY_URI, proxy_uri,
+                                        SOUP_SESSION_PROXY_RESOLVER, proxy_resolvers[SIMPLE_PROXY],
                                         NULL);
-       soup_uri_free (proxy_uri);
 
        req_uri = soup_uri_new (HTTPS_SERVER);
        soup_uri_set_path (req_uri, "/redirected");
diff --git a/tests/server-test.c b/tests/server-test.c
index 8976103e..3cc8e706 100644
--- a/tests/server-test.c
+++ b/tests/server-test.c
@@ -1345,19 +1345,23 @@ static void
 do_steal_connect_test (ServerData *sd, gconstpointer test_data)
 {
        SoupServer *proxy;
-       SoupURI *proxy_uri;
        SoupSession *session;
        SoupMessage *msg;
+       SoupURI *proxy_uri;
+       char *proxy_uri_str;
+       GProxyResolver *resolver;
        const char *handled_by;
 
        SOUP_TEST_SKIP_IF_NO_TLS;
 
        proxy = soup_test_server_new (SOUP_TEST_SERVER_IN_THREAD);
-       proxy_uri = soup_test_server_get_uri (proxy, SOUP_URI_SCHEME_HTTP, "127.0.0.1");
+        proxy_uri = soup_test_server_get_uri (proxy, SOUP_URI_SCHEME_HTTP, "127.0.0.1");
+       proxy_uri_str = soup_uri_to_string (proxy_uri, FALSE);
        soup_server_add_handler (proxy, NULL, proxy_server_callback, NULL, NULL);
 
+       resolver = g_simple_proxy_resolver_new (proxy_uri_str, NULL);
        session = soup_test_session_new (SOUP_TYPE_SESSION,
-                                        SOUP_SESSION_PROXY_URI, proxy_uri,
+                                        SOUP_SESSION_PROXY_RESOLVER, resolver,
                                         NULL);
        msg = soup_message_new_from_uri ("GET", sd->ssl_base_uri);
        soup_session_send_message (session, msg);
@@ -1370,7 +1374,9 @@ do_steal_connect_test (ServerData *sd, gconstpointer test_data)
        soup_test_session_abort_unref (session);
 
        soup_test_server_quit_unref (proxy);
+       g_object_unref (resolver);
        soup_uri_free (proxy_uri);
+       g_free (proxy_uri_str);
 }
 
 int
diff --git a/tests/session-test.c b/tests/session-test.c
index eb8cbc13..b9e1d00e 100644
--- a/tests/session-test.c
+++ b/tests/session-test.c
@@ -267,7 +267,6 @@ do_property_tests (void)
        SoupSession *session;
        GProxyResolver *proxy_resolver, *default_proxy_resolver;
        GTlsDatabase *tlsdb, *default_tlsdb;
-       SoupURI *uri;
 
        g_test_bug ("708696");
 
@@ -298,36 +297,6 @@ do_property_tests (void)
        g_object_unref (proxy_resolver);
        g_object_unref (session);
 
-       session = g_object_new (SOUP_TYPE_SESSION,
-                               SOUP_SESSION_PROXY_URI, NULL,
-                               NULL);
-       test_session_properties ("Session with NULL :proxy-uri", session,
-                                NULL, default_tlsdb);
-       g_object_unref (session);
-
-       uri = soup_uri_new ("http://example.com/";);
-       session = g_object_new (SOUP_TYPE_SESSION,
-                               SOUP_SESSION_PROXY_URI, uri,
-                               NULL);
-       g_object_get (G_OBJECT (session),
-                     SOUP_SESSION_PROXY_RESOLVER, &proxy_resolver,
-                     NULL);
-       test_session_properties ("Session with non-NULL :proxy-uri", session,
-                                proxy_resolver, default_tlsdb);
-       g_assert_cmpstr (G_OBJECT_TYPE_NAME (proxy_resolver), ==, "GSimpleProxyResolver");
-       g_object_unref (proxy_resolver);
-       g_object_unref (session);
-       soup_uri_free (uri);
-
-       G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-       session = g_object_new (SOUP_TYPE_SESSION,
-                               SOUP_SESSION_REMOVE_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_URI_RESOLVER,
-                               NULL);
-       test_session_properties ("Session with removed proxy resolver feature", session,
-                                NULL, default_tlsdb);
-       g_object_unref (session);
-       G_GNUC_END_IGNORE_DEPRECATIONS;
-
        session = g_object_new (SOUP_TYPE_SESSION,
                                SOUP_SESSION_TLS_DATABASE, NULL,
                                NULL);


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