pidgin/pidgin

merge of 'f50cd2ea8c28417c8b45f465d84ef130efcc68f0'
release-2.2.1
2007-10-01, Luke Schierer
0f5cf0aaeb07
merge of 'f50cd2ea8c28417c8b45f465d84ef130efcc68f0'
and 'a82441d2af87b5b97ccfe3171c0f1cf752456b25'
--- a/libpurple/protocols/msn/msn.c Mon Oct 01 17:48:13 2007 +0000
+++ b/libpurple/protocols/msn/msn.c Mon Oct 01 17:48: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_HTTPCONN_SERVER);
+ host = purple_account_get_string(account, "http_method_server", MSN_SERVER);
else
host = purple_account_get_string(account, "server", MSN_SERVER);
port = purple_account_get_int(account, "port", MSN_PORT);