Mercurial > pidgin3 / file diff

--- a/libpurple/http.c	Thu Feb 06 01:10:04 2014 -0800
+++ b/libpurple/http.c	Thu Feb 06 18:56:36 2014 +0530
@@ -736,8 +736,8 @@
 	proxy = purple_proxy_get_setup(hc->gc ?
 		purple_connection_get_account(hc->gc) : NULL);
 
-	proxy_http = (purple_proxy_info_get_type(proxy) == PURPLE_PROXY_HTTP ||
-		purple_proxy_info_get_type(proxy) == PURPLE_PROXY_USE_ENVVAR);
+	proxy_http = (purple_proxy_info_get_proxy_type(proxy) == PURPLE_PROXY_HTTP ||
+		purple_proxy_info_get_proxy_type(proxy) == PURPLE_PROXY_USE_ENVVAR);
 	/* this is HTTP proxy, but used with tunelling with CONNECT */
 	if (proxy_http && url->port != 80)
 		proxy_http = FALSE;