# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1283544494 0
# Node ID 64cb8836133e5bb9e038868c9c0fd08859ee6680
# Parent  1aa5e2934ef0cfbfc6d52e9513302d76bd1eb480
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).

diff -r 1aa5e2934ef0 -r 64cb8836133e libpurple/protocols/yahoo/util.c
--- a/libpurple/protocols/yahoo/util.c	Fri Sep 03 07:28:41 2010 +0000
+++ b/libpurple/protocols/yahoo/util.c	Fri Sep 03 20:08:14 2010 +0000
@@ -43,7 +43,7 @@
 	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);