# HG changeset patch # User Evan Schoenberg # Date 1191040309 0 # Node ID c37128d87d5a8f129c1dc77f6319fd3016fce6f3 # Parent c1d3d25e8c495feffdac2f834db0a372f97ff7e1 Merged MSN_HTTPCONN_SERVER fix applied changes from 4cb4d9a12002c39b0bffd5126c2f47e109fc01b1 through e82cd09b229587cf4165466490fa52898aedfb82 diff -r c1d3d25e8c49 -r c37128d87d5a libpurple/protocols/msn/msn.c --- a/libpurple/protocols/msn/msn.c Sat Sep 29 04:24:59 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Sat Sep 29 04:31:49 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);