merge of '8d080381b31344ac736285041fcde704a16220ff'

Sun, 16 Sep 2007 15:07:16 +0000

author
Sadrul Habib Chowdhury <sadrul@pidgin.im>
date
Sun, 16 Sep 2007 15:07:16 +0000
changeset 20343
1c1e5f90a1d9
parent 20342
8d080381b313 (current diff)
parent 20340
cb3a68f60510 (diff)
child 20344
ae961f42574b
child 20351
83f3c26afa02

merge of '8d080381b31344ac736285041fcde704a16220ff'
and 'cb3a68f605101909d99463d8cc5d7516190b7705'

--- a/libpurple/protocols/msn/msn.c	Sun Sep 16 15:05:14 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Sun Sep 16 15:07:16 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);

mercurial