Mercurial > pidgin

changeset 30484:64cb8836133e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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).
author Stu Tomlinson <stu@nosnilmot.com>
date Fri, 03 Sep 2010 20:08:14 +0000
parents 1aa5e2934ef0
children e97788414900
files libpurple/protocols/yahoo/util.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);