changeset
Apply my specific AIM login fix listed below to the 2.7.7 branch.
Wed, 24 Nov 2010 04:44:37 +0000
- author
- John Bailey <rekkanoryo@rekkanoryo.org>
- date
- Wed, 24 Nov 2010 04:44:37 +0000
- branch
- release-2.7.7
- changeset 31156
- ccbe6a14ed5f
- parent 31155
- 757baa7d408f
- child 31157
- 48f041af4110
Apply my specific AIM login fix listed below to the 2.7.7 branch.
*** Plucked rev b21beb71827799eec3525c256f12e609d91e6e4f (rekkanoryo@pidgin.im):
Properly handle an AIM login server of login.messaging.aol.com. Fixes #12948.
| libpurple/protocols/oscar/oscar.c | file | annotate | diff | comparison | revisions | |
| libpurple/protocols/oscar/oscarcommon.h | file | annotate | diff | comparison | revisions |
--- a/libpurple/protocols/oscar/oscar.c Wed Nov 24 04:31:54 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Wed Nov 24 04:44:37 2010 +0000 @@ -792,7 +792,7 @@ * do what we know is best for them and change the setting out * from under them to the SSL login server. */ - if (!strcmp(server, get_login_server(od->icq, FALSE))) { + if (!strcmp(server, get_login_server(od->icq, FALSE)) || !strcmp(server, AIM_ALT_LOGIN_SERVER)) { purple_debug_info("oscar", "Account uses SSL, so changing server to default SSL server\n"); purple_account_set_string(account, "server", get_login_server(od->icq, TRUE)); server = get_login_server(od->icq, TRUE);
--- a/libpurple/protocols/oscar/oscarcommon.h Wed Nov 24 04:31:54 2010 +0000 +++ b/libpurple/protocols/oscar/oscarcommon.h Wed Nov 24 04:44:37 2010 +0000 @@ -33,6 +33,7 @@ #include "status.h" #define AIM_DEFAULT_LOGIN_SERVER "login.oscar.aol.com" +#define AIM_ALT_LOGIN_SERVER "login.messaging.aol.com" #define AIM_DEFAULT_SSL_LOGIN_SERVER "slogin.oscar.aol.com" #define ICQ_DEFAULT_LOGIN_SERVER "login.icq.com" #define ICQ_DEFAULT_SSL_LOGIN_SERVER "slogin.icq.com"
