diff options
| author | Stu Tomlinson <nosnilmot@pidgin.im> | 2010-09-03 20:08:14 +0000 |
|---|---|---|
| committer | Stu Tomlinson <nosnilmot@pidgin.im> | 2010-09-03 20:08:14 +0000 |
| commit | ab217cec58035d4a4385bd9c6a1262d513a3ec3a (patch) | |
| tree | 7b3dc5e09de973fb831f2524108cc916bddabf05 | |
| parent | 98cac8b2ca24ad9aa610f5faf7995b356e7ed81c (diff) | |
| download | pidgin-ab217cec58035d4a4385bd9c6a1262d513a3ec3a.tar.gz | |
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).
| -rw-r--r-- | libpurple/protocols/yahoo/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpurple/protocols/yahoo/util.c b/libpurple/protocols/yahoo/util.c index 57bbb84b6b..4d036d9b88 100644 --- a/libpurple/protocols/yahoo/util.c +++ b/libpurple/protocols/yahoo/util.c @@ -43,7 +43,7 @@ yahoo_account_use_http_proxy(PurpleConnection *pc) 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); |