summaryrefslogtreecommitdiff
path: root/libsoup/soup-connection.h
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2013-02-16 19:20:18 -0500
committerDan Winship <danw@gnome.org>2013-07-13 11:19:11 -0400
commitfb09bf930c5e0e79b67fbbd323b46284591b8624 (patch)
tree8ba2da6e7b5efe060704560b43f5e20f9caac96d /libsoup/soup-connection.h
parente7f1e5ae3e1b218bac1f1aa70c17847aa32a7151 (diff)
downloadlibsoup-fb09bf930c5e0e79b67fbbd323b46284591b8624.tar.gz
Use GProxyResolver for all proxy resolving
Finish up the GProxyResolver porting started in 2.42 by removing all the non-GProxyResolver proxy code from SoupSocket and SoupConnection and implementing SoupSession:proxy-uri in terms of GSimpleProxyResolver. If the user adds a SoupProxyResolverDefault to the session, just use its GProxyResolver directly instead. If the user adds any other kind of SoupProxyURIResolver to the session, use the new SoupProxyResolverWrapper, which is a GProxyResolver that translates from SoupProxyURIResolver. https://bugzilla.gnome.org/show_bug.cgi?id=680273
Diffstat (limited to 'libsoup/soup-connection.h')
-rw-r--r--libsoup/soup-connection.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/libsoup/soup-connection.h b/libsoup/soup-connection.h
index dcfb56ac..50fb7018 100644
--- a/libsoup/soup-connection.h
+++ b/libsoup/soup-connection.h
@@ -41,8 +41,7 @@ typedef void (*SoupConnectionCallback) (SoupConnection *conn,
#define SOUP_CONNECTION_LOCAL_ADDRESS "local-address"
#define SOUP_CONNECTION_REMOTE_URI "remote-uri"
-#define SOUP_CONNECTION_SOUP_PROXY_RESOLVER "soup-proxy-resolver"
-#define SOUP_CONNECTION_G_PROXY_RESOLVER "g-proxy-resolver"
+#define SOUP_CONNECTION_PROXY_RESOLVER "proxy-resolver"
#define SOUP_CONNECTION_SSL "ssl"
#define SOUP_CONNECTION_SSL_CREDENTIALS "ssl-creds"
#define SOUP_CONNECTION_SSL_STRICT "ssl-strict"