Changeset e5d2c56 for protocols/purple

Timestamp:

2019-02-03T15:18:54Z (6 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

e17d0a4

Parents:

9de451d

git-author:

dequis <dx@…> (03-02-19 15:18:17)

git-committer:

dequis <dx@…> (03-02-19 15:18:54)

Message:

Remove OSCAR since both ICQ and AIM are dead

RIP.

File:

• protocols/purple/purple.c (modified) (5 diffs)

protocols/purple/purple.c

@@ -107 +107 @@
 }
 
-static char *purple_get_account_prpl_id(account_t *acc)
-{
-        /* "oscar" is how non-purple bitlbee calls it,
-         * and it might be icq or aim, depending on the username */
-        if (g_strcmp0(acc->prpl->name, "oscar") == 0) {
-                return (g_ascii_isdigit(acc->user[0])) ? "prpl-icq" : "prpl-aim";
-        }
-
-        return acc->prpl->data;
-}
-
 static gboolean purple_account_should_set_nick(account_t *acc)
 {
@@ -127 +116 @@
                 "prpl-hangouts",
                 "prpl-eionrobb-funyahoo-plusplus",
-                "prpl-icq",
                 "prpl-line",
                 NULL,
@@ -144 +132 @@
 static void purple_init(account_t *acc)
 {
-        char *prpl_id = purple_get_account_prpl_id(acc);
+        char *prpl_id = acc->prpl->data;
         PurplePlugin *prpl = purple_plugins_find_with_id(prpl_id);
         PurplePluginProtocolInfo *pi = prpl->info->extra_info;
@@ -399 +387 @@
 
         ic->proto_data = pd = g_new0(struct purple_data, 1);
-        pd->account = purple_account_new(acc->user, purple_get_account_prpl_id(acc));
+        pd->account = purple_account_new(acc->user, acc->prpl->data);
         pd->input_requests = g_hash_table_new_full(g_direct_hash, g_direct_equal,
                                                    NULL, g_free);
@@ -1957 +1945 @@
                 g_string_append_printf(help, "\n* %s (%s)", ret->name, prot->info->name);
 
-                /* libpurple doesn't define a protocol called OSCAR, but we
-                   need it to be compatible with normal BitlBee. */
-                if (g_strcasecmp(prot->info->id, "prpl-aim") == 0) {
-                        ret = g_memdup(&funcs, sizeof(funcs));
-                        ret->name = "oscar";
-                        /* purple_get_account_prpl_id() determines the actual protocol ID (icq/aim) */
-                        ret->data = NULL;
-                        register_protocol(ret);
-                }
-
                 info = g_new0(struct plugin_info, 1);
                 info->abiver = BITLBEE_ABI_VERSION_CODE;