Permalink
Browse files

Remove OSCAR since both ICQ and AIM are dead

RIP.
  • Loading branch information...
dequis committed Feb 3, 2019
1 parent 9de451d commit e5d2c5607310ef9669a051a1b93e019319495955
Showing with 8 additions and 14,918 deletions.
  1. +0 −11 configure
  2. +5 −5 debian/control
  3. +0 −15 doc/user-guide/commands.xml
  4. +1 −7 protocols/account.c
  5. +0 −10 protocols/nogaim.c
  6. +0 −31 protocols/oscar/AUTHORS
  7. +0 −504 protocols/oscar/COPYING
  8. +0 −47 protocols/oscar/Makefile
  9. +0 −206 protocols/oscar/admin.c
  10. +0 −13 protocols/oscar/admin.h
  11. +0 −892 protocols/oscar/aim.h
  12. +0 −209 protocols/oscar/aim_internal.h
  13. +0 −93 protocols/oscar/aim_prefixes.h
  14. +0 −421 protocols/oscar/auth.c
  15. +0 −85 protocols/oscar/bos.c
  16. +0 −14 protocols/oscar/bos.h
  17. +0 −97 protocols/oscar/buddylist.c
  18. +0 −19 protocols/oscar/buddylist.h
  19. +0 −671 protocols/oscar/chat.c
  20. +0 −17 protocols/oscar/chat.h
  21. +0 −452 protocols/oscar/chatnav.c
  22. +0 −14 protocols/oscar/chatnav.h
  23. +0 −633 protocols/oscar/conn.c
  24. +0 −387 protocols/oscar/icq.c
  25. +0 −97 protocols/oscar/icq.h
  26. +0 −1,561 protocols/oscar/im.c
  27. +0 −184 protocols/oscar/im.h
  28. +0 −557 protocols/oscar/info.c
  29. +0 −42 protocols/oscar/info.h
  30. +0 −239 protocols/oscar/misc.c
  31. +0 −172 protocols/oscar/msgcookie.c
  32. +0 −2,720 protocols/oscar/oscar.c
  33. +0 −78 protocols/oscar/oscar_util.c
  34. +0 −384 protocols/oscar/rxhandlers.c
  35. +0 −530 protocols/oscar/rxqueue.c
  36. +0 −106 protocols/oscar/search.c
  37. +0 −4 protocols/oscar/search.h
  38. +0 −806 protocols/oscar/service.c
  39. +0 −156 protocols/oscar/snac.c
  40. +0 −1,339 protocols/oscar/ssi.c
  41. +0 −74 protocols/oscar/ssi.h
  42. +0 −41 protocols/oscar/stats.c
  43. +0 −578 protocols/oscar/tlv.c
  44. +0 −373 protocols/oscar/txqueue.c
  45. +2 −24 protocols/purple/purple.c
@@ -33,7 +33,6 @@ configure_args="$@"
# Otherwise, if it's still default-on, it gets included in normal builds,
# but not purple ones.
jabber="default-on"
oscar="default-on"

twitter=1
purple=0
@@ -128,7 +127,6 @@ Option Description Default
--verbose=0/1 Disable/enable verbose build $verbose
--jabber=0/1 Disable/enable Jabber part $jabber
--oscar=0/1 Disable/enable Oscar part (ICQ, AIM) $oscar
--twitter=0/1 Disable/enable Twitter part $twitter
--purple=0/1 Disable/enable libpurple support $purple
@@ -858,7 +856,6 @@ EOF

# only disable these if the user didn't enable them explicitly
[ "$jabber" = "default-on" ] && jabber=0
[ "$oscar" = "default-on" ] && oscar=0

echo '#undef PACKAGE' >> config.h
echo '#define PACKAGE "BitlBee-LIBPURPLE"' >> config.h
@@ -887,14 +884,6 @@ else
protoobjs=$protoobjs'jabber_mod.o '
fi

if [ "$oscar" = 0 ]; then
echo '#undef WITH_OSCAR' >> config.h
else
echo '#define WITH_OSCAR' >> config.h
protocols=$protocols'oscar '
protoobjs=$protoobjs'oscar_mod.o '
fi

if [ "$twitter" = 0 ]; then
echo '#undef WITH_TWITTER' >> config.h
else
@@ -17,7 +17,7 @@ Replaces: bitlbee-libpurple
Description: IRC to other chat networks gateway (default version)
This program can be used as an IRC server which forwards everything you
say to people on other chat networks: Jabber (which includes Google
Talk), ICQ, AIM, MSN and Twitter.
Talk), and Twitter.

Package: bitlbee-libpurple
Architecture: any
@@ -27,7 +27,7 @@ Replaces: bitlbee
Description: IRC to other chat networks gateway (using libpurple)
This program can be used as an IRC server which forwards everything you
say to people on other chat networks: Jabber (which includes Google
Talk), ICQ, AIM, MSN and Twitter.
Talk), and Twitter.
.
This package contains a version of BitlBee that uses the libpurple instant
messaging library instead of built-in code, which adds support for more IM
@@ -43,7 +43,7 @@ Replaces: bitlbee
Description: IRC to other chat networks gateway (common files/docs)
This program can be used as an IRC server which forwards everything you
say to people on other chat networks: Jabber (which includes Google
Talk), ICQ, AIM, MSN and Twitter.
Talk), and Twitter.
.
This package contains common files (mostly documentation) for bitlbee and
bitlbee-libpurple.
@@ -54,7 +54,7 @@ Depends: ${misc:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= $
Description: IRC to other chat networks gateway (dev files)
This program can be used as an IRC server which forwards everything you
say to people on other chat networks: Jabber (which includes Google
Talk), ICQ, AIM, MSN and Twitter.
Talk), and Twitter.
.
This package holds development stuff for compiling plug-ins.

@@ -64,7 +64,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bit
Description: IRC to other chat networks gateway (OTR plugin)
This program can be used as an IRC server which forwards everything you
say to people on other chat networks: Jabber (which includes Google
Talk), ICQ, AIM, MSN and Twitter.
Talk), and Twitter.
.
This package contains a plugin that adds support for Off-The-Record
encryption of instant messages.
@@ -42,21 +42,6 @@
</description>
</bitlbee-command>

<bitlbee-command name="oscar">
<syntax>account add oscar &lt;handle&gt; [&lt;password&gt;]</syntax>

<description>
<para>
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.
</para>
</description>

<ircexample>
<ircline nick="wilmer">account add oscar 72696705 hobbelmeeuw</ircline>
<ircline nick="root">Account successfully added</ircline>
</ircexample>
</bitlbee-command>

<bitlbee-command name="twitter">
<syntax>account add twitter &lt;handle&gt;</syntax>

@@ -85,13 +85,7 @@ account_t *account_add(bee_t *bee, struct prpl *prpl, char *user, char *pass)

/* 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")) {
strcpy(tag, "gtalk");
@@ -239,11 +239,6 @@ char *explain_unknown_protocol(const char *name)
}

#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
return g_strconcat("The protocol plugin is not installed or could not be loaded. "
@@ -253,15 +248,10 @@ char *explain_unknown_protocol(const char *name)

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
jabber_initmodule();
#endif

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit e5d2c56

Please sign in to comment.