Changeset 50988d1

Timestamp:

2016-10-31T00:38:32Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

fecdd71

Parents:

c94e208

Message:

purple: fix icq login when the protocol name is "oscar"

Which happens when moving from non-purple to purple.

Fixes trac ticket 1269

Since "oscar" doesn't exist in purple, the old code called
register_protocol() to associate oscar with prpl-aim, which meant that
aim accounts migrated seamlessly to purple but icq accounts broke
silently, throwing incorrect password errors.

Now the oscar protocol is special-cased to return prpl-aim or prpl-icq
depending on the first character of the username, which is the same
thing the built-in oscar protocol does.

File:

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

protocols/purple/purple.c

@@ -101 +101 @@
 }
 
+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 void purple_init(account_t *acc)
 {
-        PurplePlugin *prpl = purple_plugins_find_with_id((char *) acc->prpl->data);
+        char *prpl_id = purple_get_account_prpl_id(acc);
+        PurplePlugin *prpl = purple_plugins_find_with_id(prpl_id);
         PurplePluginProtocolInfo *pi = prpl->info->extra_info;
         PurpleAccount *pa;
@@ -269 +281 @@
         /* Go through all away states to figure out if away/status messages
            are possible. */
-        pa = purple_account_new(acc->user, (char *) acc->prpl->data);
+        pa = purple_account_new(acc->user, prpl_id);
         for (st = purple_account_get_status_types(pa); st; st = st->next) {
                 PurpleStatusPrimitive prim = purple_status_type_get_primitive(st->data);
@@ -347 +359 @@
 
         ic->proto_data = pd = g_new0(struct purple_data, 1);
-        pd->account = purple_account_new(acc->user, (char *) acc->prpl->data);
+        pd->account = purple_account_new(acc->user, purple_get_account_prpl_id(acc));
         pd->input_requests = g_hash_table_new_full(g_direct_hash, g_direct_equal,
                                                    NULL, g_free);
@@ -1709 +1721 @@
                         ret = g_memdup(&funcs, sizeof(funcs));
                         ret->name = "oscar";
-                        ret->data = prot->info->id;
+                        /* purple_get_account_prpl_id() determines the actual protocol ID (icq/aim) */
+                        ret->data = NULL;
                         register_protocol(ret);
                 }