Mercurial > pidgin.yaz
diff libpurple/protocols/yahoo/util.c @ 31007:c5ba7dd399fa
merged from im.pidgin.pidgin:
- oscar.c needs to be revised
- changes in google.c may need to be salvaged
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Wed, 22 Sep 2010 14:17:09 +0900 |
| parents | 81ffeb069847 64cb8836133e |
| children | fa88dc1dcabb |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/util.c Tue Aug 17 17:23:13 2010 +0900 +++ b/libpurple/protocols/yahoo/util.c Wed Sep 22 14:17:09 2010 +0900 @@ -44,7 +44,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);