changeset
merge of '352f79e0c384836a07c9c560c76f052ff87b14b3'
Sun, 16 Sep 2007 05:31:33 +0000
- author
- Evan Schoenberg <evands@pidgin.im>
- date
- Sun, 16 Sep 2007 05:31:33 +0000
- changeset 20340
- cb3a68f60510
- parent 20339
- 352f79e0c384 (current diff)
- parent 20067
- d4296f47d14f (diff)
- child 20341
- a20de3c1c254
- child 20343
- 1c1e5f90a1d9
merge of '352f79e0c384836a07c9c560c76f052ff87b14b3'
and 'd4296f47d14fe1e1da3a2f859309865d50c68a5a'
| libpurple/protocols/jabber/.todo | file | annotate | diff | comparison | revisions | |
| libpurple/protocols/msn/msn.c | file | annotate | diff | comparison | revisions | |
| libpurple/protocols/oscar/.todo | file | annotate | diff | comparison | revisions |
--- 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);
