Mercurial > pidgin
changeset 30895:9fc5ba01b321
merge of 'a620b30d584e5cb6309f10afa12d79f6b5f0a9b2'
and 'b01c2771dfe0c2c521afb1699a3a9c509c12567d'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 02 Nov 2010 01:56:59 +0000 |
| parents | d9e21370fca0 (current diff) a636aa086d0b (diff) |
| children | 5750f2f2cc0d |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Nov 01 18:57:39 2010 +0000 +++ b/ChangeLog Tue Nov 02 01:56:59 2010 +0000 @@ -2,15 +2,13 @@ version 2.7.6 (??/??/????): MSN: - * Added support for MSNP16: - * Added support for "Multi Points of Presence" (MPOP), which let users - to sign on multiple places at the same time. - * Added extended capabilities support (no one implemented). - * Merged the work done on the Google SoC: - * A major rewrite of SLP code: + * Added support for MSNP16, including Multiple Points of Presence (MPOP) + which allows multiple simultaneous sign-ins. + * Added extended capabilities support (none implemented). + * Merged the work done on the Google SoC (major rewrite of SLP code) * Reworked the data transfer architecture. (http://developer.pidgin.im/wiki/SlpArchitecture) - * A lot of love to MSN prpl. + * Lots of little changes. version 2.7.5 (10/31/2010): General:
--- a/libpurple/account.c Mon Nov 01 18:57:39 2010 +0000 +++ b/libpurple/account.c Tue Nov 02 01:56:59 2010 +0000 @@ -508,8 +508,6 @@ purple_account_remove_setting(account, "xferjp_host"); } - - return; } static void @@ -531,8 +529,6 @@ if(purple_strequal(tmp, "slogin.oscar.aol.com")) purple_account_set_string(account, "server", "slogin.icq.com"); } - - return; } static void
--- a/libpurple/protocols/oscar/oscar.c Mon Nov 01 18:57:39 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Nov 02 01:56:59 2010 +0000 @@ -621,7 +621,7 @@ static const gchar *get_login_server(gboolean is_icq, gboolean use_ssl) { - return login_servers[is_icq*2 + use_ssl]; + return login_servers[(is_icq ? 2 : 0) + (use_ssl ? 1 : 0)]; } void