pidgin: 211508e7: Fix connecting to Yahoo when a global pr...

[nosnilmot at pidgin.im]

----------------------------------------------------------------------
Revision: 211508e7ca6864e6114a97e76d3bb0cdb25a8966
Parent:   2cb4747b1d1df0ae4166e4631fef87cb95b6542a
Author:   nosnilmot at pidgin.im
Date:     09/03/10 16:08:14
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/211508e7ca6864e6114a97e76d3bb0cdb25a8966

Changelog: 

Fix connecting to Yahoo when a global proxy has been specified, but is
not actually going to be used in the connection (eg. because we're
running under gnome).

Changes against parent 2cb4747b1d1df0ae4166e4631fef87cb95b6542a

  patched  libpurple/protocols/yahoo/util.c

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/util.c	bbd849135757fe7f16a2945beae0724771ef0179
+++ libpurple/protocols/yahoo/util.c	7b9c1626608fe9bbf60ed857f242bc2b7fd0f3f7
@@ -43,7 +43,7 @@ yahoo_account_use_http_proxy(PurpleConne
 	if(proxy_ssl)
 		ppi = purple_proxy_get_setup(account);
 	else
-		ppi = purple_global_proxy_get_info();
+		ppi = purple_proxy_get_setup(NULL);
 
 	type = purple_proxy_info_get_type(ppi);