comparison: libgaim/protocols/msn/httpconn.c
libgaim/protocols/msn/httpconn.c
- changeset 15041
- 18a6f6cdce33
- parent 14899
- c65f0b4fb351
- child 20470
- 77693555855f
- child 20472
- 6a6d2ef151e6
equal
deleted
inserted
replaced
| 15040:433e06134a7b | 15041:18a6f6cdce33 |
|---|---|
| 473 const char *username, *password; | 473 const char *username, *password; |
| 474 char *auth = NULL; | 474 char *auth = NULL; |
| 475 | 475 |
| 476 account = httpconn->session->account; | 476 account = httpconn->session->account; |
| 477 | 477 |
| 478 if (gaim_account_get_proxy_info(account) == NULL) | 478 gpi = gaim_proxy_get_setup(account); |
| 479 gpi = gaim_global_proxy_get_info(); | |
| 480 else | |
| 481 gpi = gaim_account_get_proxy_info(account); | |
| 482 | 479 |
| 483 if (gpi == NULL || !(gaim_proxy_info_get_type(gpi) == GAIM_PROXY_HTTP || | 480 if (gpi == NULL || !(gaim_proxy_info_get_type(gpi) == GAIM_PROXY_HTTP || |
| 484 gaim_proxy_info_get_type(gpi) == GAIM_PROXY_USE_ENVVAR)) | 481 gaim_proxy_info_get_type(gpi) == GAIM_PROXY_USE_ENVVAR)) |
| 485 return NULL; | 482 return NULL; |
| 486 | 483 |
