Mercurial > pidgin.yaz
changeset 20086:2a4550082d66
merge of '5eb5c567b85fa0c57d69ad649e737c11b45b70ec'
and 'e82cd09b229587cf4165466490fa52898aedfb82'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Sun, 16 Sep 2007 05:31:33 +0000 |
| parents | de39f3855e8f (current diff) d4bb8b85ab2e (diff) |
| children | 94874ffc3760 c43f96170910 |
| files | libpurple/protocols/jabber/.todo libpurple/protocols/msn/msn.c libpurple/protocols/oscar/.todo |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Sun Sep 16 04:07:38 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Sun Sep 16 05:31:33 2007 +0000 @@ -731,7 +731,7 @@ http_method = purple_account_get_bool(account, "http_method", FALSE); if (http_method) - host = purple_account_get_string(account, "http_method_server", MSN_SERVER); + host = purple_account_get_string(account, "http_method_server", MSN_HTTPCONN_SERVER); else host = purple_account_get_string(account, "server", MSN_SERVER); port = purple_account_get_int(account, "port", MSN_PORT);