Mercurial > pidgin.yaz

changeset 31089:f3e3e7fecf34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tweak the login server migration for ICQ: darkrain42 pointed out that I put the wrong hostname in here for the secure AIM login server. We then discussed and determined that the migration code should also cover both non-secure AIM login server hostnames that we've used.
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 31 Oct 2010 23:52:24 +0000
parents 948a94dcff94
children d81cca013782
files libpurple/account.c
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/account.c	Sun Oct 31 23:43:30 2010 +0000
+++ b/libpurple/account.c	Sun Oct 31 23:52:24 2010 +0000
@@ -520,14 +520,15 @@
 	 * for details on the change. */
 
 	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) {
+		char *tmp = purple_account_get_string(account, "server", NULL);
+
 		/* Non-secure server */
-		if(purple_strequal(purple_account_get_string(account, "server", NULL),
-				"login.messaging.aol.com"))
+		if(purple_strequal(tmp,	"login.messaging.aol.com") ||
+				purple_strequal(tmp, "login.oscar.aol.com"))
 			purple_account_set_string(account, "server", "login.icq.com");
 
 		/* Secure server */
-		if(purple_strequal(purple_account_get_string(account, "server", NULL),
-				"slogin.messaging.aol.com"))
+		if(purple_strequal(tmp, "slogin.oscar.aol.com"))
 			purple_account_set_string(account, "server", "slogin.icq.com");
 	}