# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1290486809 0
# Node ID 04ffd3b52283462eeeaf08153be2a8dc45278763
# Parent  27c56e6b5fa6329b35775c26c7986e37d46d94cf
Properly handle an AIM login server of login.messaging.aol.com.  Fixes #12948.

diff -r 27c56e6b5fa6 -r 04ffd3b52283 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Tue Nov 23 01:56:12 2010 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Tue Nov 23 04:33:29 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);
diff -r 27c56e6b5fa6 -r 04ffd3b52283 libpurple/protocols/oscar/oscarcommon.h
--- a/libpurple/protocols/oscar/oscarcommon.h	Tue Nov 23 01:56:12 2010 +0000
+++ b/libpurple/protocols/oscar/oscarcommon.h	Tue Nov 23 04:33:29 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"