pidgin.2.7.7: 9fe7b6c4: Apply my specific AIM login fix listed b...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 9fe7b6c4c4d9a15fc87bae6aa6b6521af0a0dca2
Parent:   1dcd5e71e9221567a04e9ed9b893bd2a4293a8ae
Author:   rekkanoryo at pidgin.im
Date:     11/23/10 23:44:37
Branch:   im.pidgin.pidgin.2.7.7
URL: http://d.pidgin.im/viewmtn/revision/info/9fe7b6c4c4d9a15fc87bae6aa6b6521af0a0dca2

Changelog: 

Apply my specific AIM login fix listed below to the 2.7.7 branch.

*** Plucked rev b21beb71827799eec3525c256f12e609d91e6e4f (rekkanoryo at pidgin.im):
Properly handle an AIM login server of login.messaging.aol.com.  Fixes #12948.

Changes against parent 1dcd5e71e9221567a04e9ed9b893bd2a4293a8ae

  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscarcommon.h

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	82395d2f22f147eb06810bb105108d79273f48ab
+++ libpurple/protocols/oscar/oscar.c	9e7fe7137a6338d84de41fa04c5e3f3d86ea2cee
@@ -792,7 +792,7 @@ oscar_login(PurpleAccount *account)
 			 * 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);
============================================================
--- libpurple/protocols/oscar/oscarcommon.h	589c37dec2f04a78175c73553ad05fd61681e6d5
+++ libpurple/protocols/oscar/oscarcommon.h	0050276cd26a9c73649aa6f6837387eab4abe7f4
@@ -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"