From fb09bf930c5e0e79b67fbbd323b46284591b8624 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Sat, 16 Feb 2013 19:20:18 -0500 Subject: 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 --- libsoup/soup-connection.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libsoup/soup-connection.h') 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" -- cgit v1.2.1