--- a/libpurple/accounts.c Thu Oct 29 23:26:02 2020 -0500
+++ b/libpurple/accounts.c Thu Oct 29 23:28:12 2020 -0500
@@ -102,27 +102,6 @@
-migrate_icq_server(PurpleAccount *account)
- /* Migrate the login server setting for ICQ accounts. See
- * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794'
- * for details on the change. */
- if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) {
- const char *tmp = purple_account_get_string(account, "server", NULL);
- /* Non-secure server */
- if(purple_strequal(tmp, "login.messaging.aol.com") ||
- purple_strequal(tmp, "login.oscar.aol.com"))
- purple_account_set_string(account, "server", "login.icq.com");
- if(purple_strequal(tmp, "slogin.oscar.aol.com"))
- purple_account_set_string(account, "server", "slogin.icq.com");
migrate_xmpp_encryption(PurpleAccount *account)
/* When this is removed, nuke the "old_ssl" and "require_tls" settings */
@@ -205,9 +184,6 @@
- /* we do this here because we need access to account settings to determine
- * if we can/should migrate an ICQ account's server setting */
- migrate_icq_server(account);
/* we do this here because we need to do it before the user views the
* Edit Account dialog. */
migrate_xmpp_encryption(account);