Changeset e5d2c56 for protocols

Timestamp:

2019-02-03T15:18:54Z (5 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.

Location:

protocols

Files:

• account.c (modified) (1 diff)
• nogaim.c (modified) (2 diffs)
• oscar/AUTHORS (deleted)
• oscar/COPYING (deleted)
• oscar/Makefile (deleted)
• oscar/admin.c (deleted)
• oscar/admin.h (deleted)
• oscar/aim.h (deleted)
• oscar/aim_internal.h (deleted)
• oscar/aim_prefixes.h (deleted)
• oscar/auth.c (deleted)
• oscar/bos.c (deleted)
• oscar/bos.h (deleted)
• oscar/buddylist.c (deleted)
• oscar/buddylist.h (deleted)
• oscar/chat.c (deleted)
• oscar/chat.h (deleted)
• oscar/chatnav.c (deleted)
• oscar/chatnav.h (deleted)
• oscar/conn.c (deleted)
• oscar/icq.c (deleted)
• oscar/icq.h (deleted)
• oscar/im.c (deleted)
• oscar/im.h (deleted)
• oscar/info.c (deleted)
• oscar/info.h (deleted)
• oscar/misc.c (deleted)
• oscar/msgcookie.c (deleted)
• oscar/oscar.c (deleted)
• oscar/oscar_util.c (deleted)
• oscar/rxhandlers.c (deleted)
• oscar/rxqueue.c (deleted)
• oscar/search.c (deleted)
• oscar/search.h (deleted)
• oscar/service.c (deleted)
• oscar/snac.c (deleted)
• oscar/ssi.c (deleted)
• oscar/ssi.h (deleted)
• oscar/stats.c (deleted)
• oscar/tlv.c (deleted)
• oscar/txqueue.c (deleted)
• purple/purple.c (modified) (5 diffs)

protocols/account.c

@@ -86 +86 @@
         /* Hardcode some more clever tag guesses. */
         strcpy(tag, prpl->name);
-        if (strcmp(prpl->name, "oscar") == 0) {
-                if (g_ascii_isdigit(a->user[0])) {
-                        strcpy(tag, "icq");
-                } else {
-                        strcpy(tag, "aim");
-                }
-        } else if (strcmp(prpl->name, "jabber") == 0) {
+        if (strcmp(prpl->name, "jabber") == 0) {
                 if (strstr(a->user, "@gmail.com") ||
                     strstr(a->user, "@googlemail.com")) {

protocols/nogaim.c

@@ -240 +240 @@
 
 #else
-        if (strcmp(name, "aim") == 0 || strcmp(name, "icq") == 0) {
-                return g_strdup("This account uses libpurple specific aliases for oscar. "
-                                "Re-add the account with `account add oscar ...'");
-        }
-
         extramsg = "If this is a libpurple plugin, you might need to install bitlbee-libpurple instead.";
 #endif
@@ -254 +249 @@
 void nogaim_init()
 {
-        extern void oscar_initmodule();
         extern void jabber_initmodule();
         extern void twitter_initmodule();
         extern void purple_initmodule();
-
-#ifdef WITH_OSCAR
-        oscar_initmodule();
-#endif
 
 #ifdef WITH_JABBER

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;