Changeset e5d2c56


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

Files:
39 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • configure

    r9de451d re5d2c56  
    3434# but not purple ones.
    3535jabber="default-on"
    36 oscar="default-on"
    3736
    3837twitter=1
     
    129128
    130129--jabber=0/1    Disable/enable Jabber part              $jabber
    131 --oscar=0/1     Disable/enable Oscar part (ICQ, AIM)    $oscar
    132130--twitter=0/1   Disable/enable Twitter part             $twitter
    133131
     
    859857        # only disable these if the user didn't enable them explicitly
    860858        [ "$jabber" = "default-on" ] && jabber=0
    861         [ "$oscar" = "default-on" ] && oscar=0
    862859
    863860        echo '#undef PACKAGE' >> config.h
     
    886883        protocols=$protocols'jabber '
    887884        protoobjs=$protoobjs'jabber_mod.o '
    888 fi
    889 
    890 if [ "$oscar" = 0 ]; then
    891         echo '#undef WITH_OSCAR' >> config.h
    892 else
    893         echo '#define WITH_OSCAR' >> config.h
    894         protocols=$protocols'oscar '
    895         protoobjs=$protoobjs'oscar_mod.o '
    896885fi
    897886
  • debian/control

    r9de451d re5d2c56  
    1818 This program can be used as an IRC server which forwards everything you
    1919 say to people on other chat networks: Jabber (which includes Google
    20  Talk), ICQ, AIM, MSN and Twitter.
     20 Talk), and Twitter.
    2121
    2222Package: bitlbee-libpurple
     
    2828 This program can be used as an IRC server which forwards everything you
    2929 say to people on other chat networks: Jabber (which includes Google
    30  Talk), ICQ, AIM, MSN and Twitter.
     30 Talk), and Twitter.
    3131 .
    3232 This package contains a version of BitlBee that uses the libpurple instant
     
    4444 This program can be used as an IRC server which forwards everything you
    4545 say to people on other chat networks: Jabber (which includes Google
    46  Talk), ICQ, AIM, MSN and Twitter.
     46 Talk), and Twitter.
    4747 .
    4848 This package contains common files (mostly documentation) for bitlbee and
     
    5555 This program can be used as an IRC server which forwards everything you
    5656 say to people on other chat networks: Jabber (which includes Google
    57  Talk), ICQ, AIM, MSN and Twitter.
     57 Talk), and Twitter.
    5858 .
    5959 This package holds development stuff for compiling plug-ins.
     
    6565 This program can be used as an IRC server which forwards everything you
    6666 say to people on other chat networks: Jabber (which includes Google
    67  Talk), ICQ, AIM, MSN and Twitter.
     67 Talk), and Twitter.
    6868 .
    6969 This package contains a plugin that adds support for Off-The-Record
  • doc/user-guide/commands.xml

    r9de451d re5d2c56  
    4343                        </bitlbee-command>
    4444
    45                         <bitlbee-command name="oscar">
    46                                 <syntax>account add oscar &lt;handle&gt; [&lt;password&gt;]</syntax>
    47 
    48                                 <description>
    49                                         <para>
    50                                                 OSCAR is the protocol used to connect to AIM and/or ICQ. The servers will automatically detect if you're using a numeric or non-numeric username so there's no need to tell which network you want to connect to.
    51                                         </para>
    52                                 </description>
    53 
    54                                 <ircexample>
    55                                         <ircline nick="wilmer">account add oscar 72696705 hobbelmeeuw</ircline>
    56                                         <ircline nick="root">Account successfully added</ircline>
    57                                 </ircexample>
    58                         </bitlbee-command>
    59                        
    6045                        <bitlbee-command name="twitter">
    6146                                <syntax>account add twitter &lt;handle&gt;</syntax>
  • protocols/account.c

    r9de451d re5d2c56  
    8686        /* Hardcode some more clever tag guesses. */
    8787        strcpy(tag, prpl->name);
    88         if (strcmp(prpl->name, "oscar") == 0) {
    89                 if (g_ascii_isdigit(a->user[0])) {
    90                         strcpy(tag, "icq");
    91                 } else {
    92                         strcpy(tag, "aim");
    93                 }
    94         } else if (strcmp(prpl->name, "jabber") == 0) {
     88        if (strcmp(prpl->name, "jabber") == 0) {
    9589                if (strstr(a->user, "@gmail.com") ||
    9690                    strstr(a->user, "@googlemail.com")) {
  • protocols/nogaim.c

    r9de451d re5d2c56  
    240240
    241241#else
    242         if (strcmp(name, "aim") == 0 || strcmp(name, "icq") == 0) {
    243                 return g_strdup("This account uses libpurple specific aliases for oscar. "
    244                                 "Re-add the account with `account add oscar ...'");
    245         }
    246 
    247242        extramsg = "If this is a libpurple plugin, you might need to install bitlbee-libpurple instead.";
    248243#endif
     
    254249void nogaim_init()
    255250{
    256         extern void oscar_initmodule();
    257251        extern void jabber_initmodule();
    258252        extern void twitter_initmodule();
    259253        extern void purple_initmodule();
    260 
    261 #ifdef WITH_OSCAR
    262         oscar_initmodule();
    263 #endif
    264254
    265255#ifdef WITH_JABBER
  • 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.