pidgin: 4d2f0e82: Tweak the login server migration for ICQ...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 4d2f0e821b06b6b35b2c2790d33d676286378301
Parent:   f66a462582d88603680b07482658645162a98ed5
Author:   rekkanoryo at pidgin.im
Date:     10/31/10 19:52:24
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4d2f0e821b06b6b35b2c2790d33d676286378301

Changelog: 

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.

Changes against parent f66a462582d88603680b07482658645162a98ed5

  patched  libpurple/account.c

-------------- next part --------------
============================================================
--- libpurple/account.c	45145a159c92b2115e1d74917071e964b422d66a
+++ libpurple/account.c	8eabb0d4c3620feafb00f9014fc8511c5cf2dc51
@@ -520,14 +520,15 @@ migrate_icq_server(PurpleAccount *accoun
 	 * 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");
 	}