Mercurial > pidgin
changeset 25316:fb0340112a64
merge of '74c268c89bbcb796bd93e892d622370cf996ae77'
and '86f401028e5edbd8613c5d956c9158234da40670'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 12 Jan 2009 18:30:57 +0000 |
| parents | f080f47565db (current diff) 6bee94ca522a (diff) |
| children | fbef4cf4c783 |
| files | ChangeLog |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 12 04:45:22 2009 +0000 +++ b/ChangeLog Mon Jan 12 18:30:57 2009 +0000 @@ -12,6 +12,10 @@ * Fix the hang on exit in Network Location Awareness for Windows XP and Windows Vista. (Paul Aurich) + MSN: + * Change Contact Server to temporarily fix connection problems. + (Thanks to Youness Alaoui) + XMPP: * Support for XEP-0191 blocking. (Vijay Raghunathan) * Don't put SASL PLAIN or IQ Auth passwords in debug logs. (Paul Aurich)
--- a/libpurple/protocols/msn/contact.h Mon Jan 12 04:45:22 2009 +0000 +++ b/libpurple/protocols/msn/contact.h Mon Jan 12 18:30:57 2009 +0000 @@ -30,7 +30,7 @@ #define MSN_APPLICATION_ID "CFE80F9D-180F-4399-82AB-413F33A1FA11" -#define MSN_CONTACT_SERVER "contacts.msn.com" +#define MSN_CONTACT_SERVER "omega.contacts.msn.com" /* Get Contact List */