diff options
author | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 14:31:58 +0000 |
---|---|---|
committer | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 14:31:58 +0000 |
commit | 8f785b621b3ed83e80949b57a31145bbfb5b72ed (patch) | |
tree | bdf7d009702adc91e63d261f7d924d9e5bf94cff /libsoup/soup-proxy-resolver-default.c | |
parent | 0d45677b0a20270735e4d18e969a4991a4e67078 (diff) | |
parent | 6c14af04775a9de4dfa3fa0cc15a7ad0462ef3d9 (diff) | |
download | libsoup-8f785b621b3ed83e80949b57a31145bbfb5b72ed.tar.gz |
Merge tag '2.46.0' into baserock/markdoffman/morphbaserock/markdoffman/morph
2.46.0
Diffstat (limited to 'libsoup/soup-proxy-resolver-default.c')
-rw-r--r-- | libsoup/soup-proxy-resolver-default.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/libsoup/soup-proxy-resolver-default.c b/libsoup/soup-proxy-resolver-default.c index 76e9ff6d..7fd09349 100644 --- a/libsoup/soup-proxy-resolver-default.c +++ b/libsoup/soup-proxy-resolver-default.c @@ -9,16 +9,29 @@ #include <config.h> #endif +#undef SOUP_VERSION_MIN_REQUIRED +#define SOUP_VERSION_MIN_REQUIRED SOUP_VERSION_2_42 + #include "soup-proxy-resolver-default.h" #include "soup.h" /** - * SoupProxyResolverDefault: + * SECTION:soup-proxy-resolver-default + * @short_description: System proxy configuration integration + * + * #SoupProxyResolverDefault is a <type>SoupProxyURIResolver</type> + * implementation that uses the default gio #GProxyResolver to resolve + * proxies. * - * A #SoupProxyURIResolver implementation that uses the default gio - * #GProxyResolver to resolve proxies. + * In libsoup 2.44 and later, you can set the session's + * #SoupSession:proxy-resolver property to the resolver returned by + * g_proxy_resolver_get_default() to get the same effect. Note that + * for "plain" #SoupSessions (ie, not #SoupSessionAsync or + * #SoupSessionSync), this is done for you automatically. * * Since: 2.34 + * + * Deprecated: Use #SoupSession:proxy-resolver */ static void soup_proxy_resolver_default_interface_init (SoupProxyURIResolverInterface *proxy_resolver_interface); |