Mercurial > pidgin
diff libgaim/protocols/msn/httpconn.c @ 14979:c157efddc62a
[gaim-migrate @ 17758]
Don't lose the account proxy settings just because they are hidden and not in use.
Also, make the MSN HTTP method use the same proxy setup code as the core - this should improve env. var proxy handling.
committer: Tailor Script <tailor@pidgin.im>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Thu, 16 Nov 2006 04:58:40 +0000 |
| parents | 118fd0dc5b6e |
| children |
line wrap: on
line diff
--- a/libgaim/protocols/msn/httpconn.c Thu Nov 16 03:17:27 2006 +0000 +++ b/libgaim/protocols/msn/httpconn.c Thu Nov 16 04:58:40 2006 +0000 @@ -475,10 +475,7 @@ account = httpconn->session->account; - if (gaim_account_get_proxy_info(account) == NULL) - gpi = gaim_global_proxy_get_info(); - else - gpi = gaim_account_get_proxy_info(account); + gpi = gaim_proxy_get_setup(account); if (gpi == NULL || !(gaim_proxy_info_get_type(gpi) == GAIM_PROXY_HTTP || gaim_proxy_info_get_type(gpi) == GAIM_PROXY_USE_ENVVAR))