summaryrefslogtreecommitdiff
path: root/libsoup/soup-session-sync.c
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2009-08-09 10:58:54 -0400
committerDan Winship <danw@gnome.org>2009-08-09 10:58:54 -0400
commit99bb1c5829da36abb70c7feb4f905a19f23ff8c0 (patch)
tree3867021a42240db01f50e117fbdc66e1dbe3be65 /libsoup/soup-session-sync.c
parent005bf1a75397d66028454e58e4aa1d95ac88569d (diff)
downloadlibsoup-99bb1c5829da36abb70c7feb4f905a19f23ff8c0.tar.gz
Add soup_session_get_feature_for_message, remove _get_proxy_resolver
Add a cache to soup_session_get_feature(), and remove the separate auth_manager and proxy_resolver private vars, and just use soup_session_get_feature() as needed instead. (Partly inspired by the fact that the cache branch adds yet another specially-tracked feature.) Add soup_session_get_feature_for_message() to get a feature and check soup_message_disables_feature() on it, and use that to replace soup_session_get_proxy_resolver().
Diffstat (limited to 'libsoup/soup-session-sync.c')
-rw-r--r--libsoup/soup-session-sync.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libsoup/soup-session-sync.c b/libsoup/soup-session-sync.c
index 1c1c7dc2..fb19f215 100644
--- a/libsoup/soup-session-sync.c
+++ b/libsoup/soup-session-sync.c
@@ -169,9 +169,8 @@ wait_for_connection (SoupMessageQueueItem *item)
SoupConnection *conn;
guint status;
- proxy_resolver = soup_session_get_proxy_resolver (session);
- if (proxy_resolver && !item->resolved_proxy_addr &&
- !soup_message_disables_feature (item->msg, proxy_resolver)) {
+ proxy_resolver = (SoupProxyURIResolver *)soup_session_get_feature_for_message (session, SOUP_TYPE_PROXY_URI_RESOLVER, msg);
+ if (proxy_resolver && !item->resolved_proxy_addr) {
status = soup_proxy_uri_resolver_get_proxy_uri_sync (
proxy_resolver, soup_message_get_uri (msg),
item->cancellable, &item->proxy_uri);