Mercurial > pidgin
comparison libpurple/protocols/yahoo/util.c @ 30484:64cb8836133e
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 | 984217629ec9 |
| children | a8cc50c2279f |
comparison
equal
deleted
inserted
replaced
| 30483:1aa5e2934ef0 | 30484:64cb8836133e |
|---|---|
| 41 gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE); | 41 gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE); |
| 42 | 42 |
| 43 if(proxy_ssl) | 43 if(proxy_ssl) |
| 44 ppi = purple_proxy_get_setup(account); | 44 ppi = purple_proxy_get_setup(account); |
| 45 else | 45 else |
| 46 ppi = purple_global_proxy_get_info(); | 46 ppi = purple_proxy_get_setup(NULL); |
| 47 | 47 |
| 48 type = purple_proxy_info_get_type(ppi); | 48 type = purple_proxy_info_get_type(ppi); |
| 49 | 49 |
| 50 return (type == PURPLE_PROXY_HTTP || type == PURPLE_PROXY_USE_ENVVAR); | 50 return (type == PURPLE_PROXY_HTTP || type == PURPLE_PROXY_USE_ENVVAR); |
| 51 } | 51 } |