Changeset e5d2c56 for protocols/purple


Ignore:
Timestamp:
2019-02-03T15:18:54Z (2 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:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/purple/purple.c

    r9de451d re5d2c56  
    107107}
    108108
    109 static char *purple_get_account_prpl_id(account_t *acc)
    110 {
    111         /* "oscar" is how non-purple bitlbee calls it,
    112          * and it might be icq or aim, depending on the username */
    113         if (g_strcmp0(acc->prpl->name, "oscar") == 0) {
    114                 return (g_ascii_isdigit(acc->user[0])) ? "prpl-icq" : "prpl-aim";
    115         }
    116 
    117         return acc->prpl->data;
    118 }
    119 
    120109static gboolean purple_account_should_set_nick(account_t *acc)
    121110{
     
    127116                "prpl-hangouts",
    128117                "prpl-eionrobb-funyahoo-plusplus",
    129                 "prpl-icq",
    130118                "prpl-line",
    131119                NULL,
     
    144132static void purple_init(account_t *acc)
    145133{
    146         char *prpl_id = purple_get_account_prpl_id(acc);
     134        char *prpl_id = acc->prpl->data;
    147135        PurplePlugin *prpl = purple_plugins_find_with_id(prpl_id);
    148136        PurplePluginProtocolInfo *pi = prpl->info->extra_info;
     
    399387
    400388        ic->proto_data = pd = g_new0(struct purple_data, 1);
    401         pd->account = purple_account_new(acc->user, purple_get_account_prpl_id(acc));
     389        pd->account = purple_account_new(acc->user, acc->prpl->data);
    402390        pd->input_requests = g_hash_table_new_full(g_direct_hash, g_direct_equal,
    403391                                                   NULL, g_free);
     
    19571945                g_string_append_printf(help, "\n* %s (%s)", ret->name, prot->info->name);
    19581946
    1959                 /* libpurple doesn't define a protocol called OSCAR, but we
    1960                    need it to be compatible with normal BitlBee. */
    1961                 if (g_strcasecmp(prot->info->id, "prpl-aim") == 0) {
    1962                         ret = g_memdup(&funcs, sizeof(funcs));
    1963                         ret->name = "oscar";
    1964                         /* purple_get_account_prpl_id() determines the actual protocol ID (icq/aim) */
    1965                         ret->data = NULL;
    1966                         register_protocol(ret);
    1967                 }
    1968 
    19691947                info = g_new0(struct plugin_info, 1);
    19701948                info->abiver = BITLBEE_ABI_VERSION_CODE;
Note: See TracChangeset for help on using the changeset viewer.