Changeset 4fd3c04

Timestamp:

Oct 12, 2017, 8:28:02 PM (6 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

a882637

Parents:

ee6b30f

git-author:

Anders Kaseorg <andersk@mit.edu> (10/06/17 21:27:09)

git-committer:

Anders Kaseorg <andersk@mit.edu> (10/12/17 20:28:02)

Message:

Remove AIM support

This code has received almost no security attention, and anyway, AIM
is shutting down on December 15, 2017.

https://aimemories.tumblr.com/post/166091776077/aimemories

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• Makefile.am (modified) (4 diffs)
• aim.c (deleted)
• buddy.c (deleted)
• buddylist.c (deleted)
• codelist.pl (modified) (1 diff)
• commands.c (modified) (16 diffs)
• configure.ac (modified) (3 diffs)
• doc/advanced.txt (modified) (3 diffs)
• doc/intro.txt (modified) (3 diffs)
• functions.c (modified) (16 diffs)
• global.c (modified) (5 diffs)
• help.c (modified) (4 diffs)
• keys.c (modified) (1 diff)
• libfaim/Makefile.am (deleted)
• libfaim/admin.c (deleted)
• libfaim/adverts.c (deleted)
• libfaim/aim.h (deleted)
• libfaim/aim_cbtypes.h (deleted)
• libfaim/aim_internal.h (deleted)
• libfaim/auth.c (deleted)
• libfaim/bart.c (deleted)
• libfaim/bos.c (deleted)
• libfaim/bstream.c (deleted)
• libfaim/buddylist.c (deleted)
• libfaim/chat.c (deleted)
• libfaim/chatnav.c (deleted)
• libfaim/conn.c (deleted)
• libfaim/email.c (deleted)
• libfaim/faimconfig.h (deleted)
• libfaim/ft.c (deleted)
• libfaim/icq.c (deleted)
• libfaim/im.c (deleted)
• libfaim/invite.c (deleted)
• libfaim/locate.c (deleted)
• libfaim/md5.c (deleted)
• libfaim/md5.h (deleted)
• libfaim/misc.c (deleted)
• libfaim/msgcookie.c (deleted)
• libfaim/odir.c (deleted)
• libfaim/oscar.c (deleted)
• libfaim/popups.c (deleted)
• libfaim/rxhandlers.c (deleted)
• libfaim/rxqueue.c (deleted)
• libfaim/search.c (deleted)
• libfaim/service.c (deleted)
• libfaim/snac.c (deleted)
• libfaim/ssi.c (deleted)
• libfaim/stats.c (deleted)
• libfaim/tlv.c (deleted)
• libfaim/translate.c (deleted)
• libfaim/txqueue.c (deleted)
• libfaim/util.c (deleted)
• message.c (modified) (3 diffs)
• owl.c (modified) (3 diffs)
• owl.h (modified) (5 diffs)
• perl/Makefile.am (modified) (2 diffs)
• perl/lib/BarnOwl/Complete/AIM.pm (deleted)
• perl/lib/BarnOwl/Complete/Filter.pm (modified) (1 diff)
• perl/lib/BarnOwl/Logging.pm (modified) (1 diff)
• perl/lib/BarnOwl/Message.pm (modified) (2 diffs)
• perl/lib/BarnOwl/Message/AIM.pm (deleted)
• t/completion.t (modified) (1 diff)
• variable.c (modified) (4 diffs)

Makefile.am

@@ -43 +43 @@
 dist_doc_DATA = doc/intro.txt doc/advanced.txt
 
-bin_barnowl_LDADD = compat/libcompat.a libfaim/libfaim.a
+bin_barnowl_LDADD = compat/libcompat.a
 
 bin_tester_SOURCES = $(BASE_SRCS) \
@@ -50 +50 @@
 nodist_bin_tester_SOURCES = $(GEN_C) $(GEN_H)
 
-bin_tester_LDADD = compat/libcompat.a libfaim/libfaim.a
+bin_tester_LDADD = compat/libcompat.a
 
 TESTS=runtests.sh
 
 AM_CPPFLAGS = \
-           -I$(top_srcdir)/libfaim/ \
            -DDATADIR='"$(pkgdatadir)"' \
            -DBINDIR='"$(bindir)"'
@@ -65 +64 @@
      regex.c history.c view.c dict.c variable.c filterelement.c pair.c \
      keypress.c keymap.c keybinding.c cmd.c context.c \
-     aim.c buddy.c buddylist.c style.c errqueue.c \
+     style.c errqueue.c \
      zbuddylist.c popexec.c select.c wcwidth.c \
      mainpanel.c msgwin.c sepbar.c editcontext.c signal.c closures.c
@@ -125 +124 @@
     cpanfile
 
-SUBDIRS = compat libfaim perl
+SUBDIRS = compat perl

codelist.pl

@@ -18 +18 @@
             && !/^XS/
             && !/\/\*/
-            && !/ZWRITEOPTIONS/
-            && !/owlfaim_priv/)
+            && !/ZWRITEOPTIONS/)
         {
 

commands.c

@@ -122 +122 @@
               "      Send to the specified opcode\n"),
 
-  OWLCMD_ARGS("aimwrite", owl_command_aimwrite, OWL_CTX_INTERACTIVE,
-              "send an AIM message",
-              "aimwrite <user> [-m <message...>]",
-              "Send an aim message to a user.\n\n" 
-              "The following options are available:\n\n"
-              "-m    Specifies a message to send without prompting.\n"),
-
   OWLCMD_ARGS("loopwrite", owl_command_loopwrite, OWL_CTX_INTERACTIVE,
               "send a loopback message",
@@ -234 +227 @@
               "Execute the BarnOwl commands in <filename>.\n"),
 
-  OWLCMD_ARGS("aim", owl_command_aim, OWL_CTX_INTERACTIVE,
-              "AIM specific commands",
-              "aim search <email>",
-              ""),
-
   OWLCMD_ARGS("addbuddy", owl_command_addbuddy, OWL_CTX_INTERACTIVE,
               "add a buddy to a buddylist",
               "addbuddy <protocol> <screenname>",
-              "Add the named buddy to your buddylist.  <protocol> can be aim or zephyr\n"),
+              "Add the named buddy to your buddylist.  <protocol> must be zephyr\n"),
 
   OWLCMD_ARGS("delbuddy", owl_command_delbuddy, OWL_CTX_INTERACTIVE,
               "delete a buddy from a buddylist",
               "delbuddy <protocol> <screenname>",
-              "Delete the named buddy from your buddylist.  <protocol> can be aim or zephyr\n"),
-
-  OWLCMD_ARGS("join", owl_command_join, OWL_CTX_INTERACTIVE,
-              "join a chat group",
-              "join aim <groupname> [exchange]",
-              "Join the AIM chatroom with 'groupname'.\n"),
+              "Delete the named buddy from your buddylist.  <protocol> must be zephyr\n"),
 
   OWLCMD_ARGS("smartzpunt", owl_command_smartzpunt, OWL_CTX_INTERACTIVE,
@@ -308 +291 @@
               "znol [-f file]",
               "Print a znol-style listing of users logged in"),
-
-  OWLCMD_VOID("alist", owl_command_alist, OWL_CTX_INTERACTIVE,
-              "List AIM users logged in",
-              "alist",
-              "Print a listing of AIM users logged in"),
 
   OWLCMD_VOID("blist", owl_command_blist, OWL_CTX_INTERACTIVE,
@@ -470 +448 @@
               "use the default.\n"),
 
-  OWLCMD_ARGS("aaway", owl_command_aaway, OWL_CTX_INTERACTIVE,
-              "Set, enable or disable AIM away message",
-              "aaway [ on | off | toggle ]\n"
-              "aaway <message>",
-              "Turn on or off the AIM away message.  If 'message' is\n"
-              "specified turn on aaway with that message, otherwise\n"
-              "use the default.\n"),
-
   OWLCMD_ARGS("away", owl_command_away, OWL_CTX_INTERACTIVE,
               "Set, enable or disable all away messages",
@@ -486 +456 @@
               "otherwise use the default.\n"
               "\n"
-              "SEE ALSO: aaway, zaway"),
+              "SEE ALSO: zaway"),
 
   OWLCMD_ARGS("flush-logs", owl_command_flushlogs, OWL_CTX_ANY,
@@ -548 +518 @@
               "    body       -  message body\n"
               "    hostname   -  hostname of sending host\n"
-              "    type       -  message type (zephyr, aim, admin)\n"
+              "    type       -  message type (zephyr, admin)\n"
               "    direction  -  either 'in' 'out' or 'none'\n"
               "    login      -  either 'login' 'logout' or 'none'\n"
@@ -772 +742 @@
           "no argument, it makes search highlighting inactive."),
 
-  OWLCMD_ARGS("aimlogin", owl_command_aimlogin, OWL_CTX_ANY,
-              "login to an AIM account",
-              "aimlogin <screenname> [<password>]\n",
-              ""),
-
-  OWLCMD_ARGS("aimlogout", owl_command_aimlogout, OWL_CTX_ANY,
-              "logout from AIM",
-              "aimlogout\n",
-              ""),
-
   OWLCMD_ARGS("error", owl_command_error, OWL_CTX_ANY,
               "Display an error message",
@@ -1108 +1068 @@
     }
   }
-  owl_function_buddylist(0, 1, file);
+  owl_function_buddylist(1, file);
   return(NULL);
 }
 
-void owl_command_alist(void)
-{
-  owl_function_buddylist(1, 0, NULL);
-}
-
 void owl_command_blist(void)
 {
-  owl_function_buddylist(1, 1, NULL);
+  owl_function_buddylist(1, NULL);
 }
 
@@ -1135 +1090 @@
 {
   owl_function_makemsg("BarnOwl version %s", version);
-}
-
-char *owl_command_aim(int argc, const char *const *argv, const char *buff)
-{
-  if (argc<2) {
-    owl_function_makemsg("not enough arguments to aim command");
-    return(NULL);
-  }
-
-  if (!strcmp(argv[1], "search")) {
-    if (argc!=3) {
-      owl_function_makemsg("not enough arguments to aim search command");
-      return(NULL);
-    }
-    owl_aim_search(argv[2]);
-  } else {
-    owl_function_makemsg("unknown subcommand '%s' for aim command", argv[1]);
-    return(NULL);
-  }
-  return(NULL);
 }
 
@@ -1164 +1099 @@
   }
 
-  if (!strcasecmp(argv[1], "aim")) {
-    if (!owl_global_is_aimloggedin(&g)) {
-      owl_function_makemsg("addbuddy: You must be logged into aim to use this command.");
-      return(NULL);
-    }
-    /*
-    owl_function_makemsg("This function is not yet operational.  Stay tuned.");
-    return(NULL);
-    */
-    owl_aim_addbuddy(argv[2]);
-    owl_function_makemsg("%s added as AIM buddy for %s", argv[2], owl_global_get_aim_screenname(&g));
-  } else if (!strcasecmp(argv[1], "zephyr")) {
+  if (!strcasecmp(argv[1], "zephyr")) {
     owl_zephyr_addbuddy(argv[2]);
     owl_function_makemsg("%s added as zephyr buddy", argv[2]);
   } else {
-    owl_function_makemsg("addbuddy: currently the only supported protocols are 'zephyr' and 'aim'");
+    owl_function_makemsg("addbuddy: currently the only supported protocol is 'zephyr'");
   }
 
@@ -1192 +1116 @@
   }
 
-  if (!strcasecmp(argv[1], "aim")) {
-    if (!owl_global_is_aimloggedin(&g)) {
-      owl_function_makemsg("delbuddy: You must be logged into aim to use this command.");
-      return(NULL);
-    }
-    owl_aim_delbuddy(argv[2]);
-    owl_function_makemsg("%s deleted as AIM buddy for %s", argv[2], owl_global_get_aim_screenname(&g));
-  } else if (!strcasecmp(argv[1], "zephyr")) {
+  if (!strcasecmp(argv[1], "zephyr")) {
     owl_zephyr_delbuddy(argv[2]);
     owl_function_makemsg("%s deleted as zephyr buddy", argv[2]);
   } else {
-    owl_function_makemsg("delbuddy: currently the only supported protocols are 'zephyr' and 'aim'");
-  }
-
-  return(NULL);
-}
-
-char *owl_command_join(int argc, const char *const *argv, const char *buff)
-{
-  if (argc!=3 && argc!=4) {
-    owl_function_makemsg("usage: join <protocol> <buddyname> [exchange]");
-    return(NULL);
-  }
-
-  if (!strcasecmp(argv[1], "aim")) {
-    if (!owl_global_is_aimloggedin(&g)) {
-      owl_function_makemsg("join aim: You must be logged into aim to use this command.");
-      return(NULL);
-    }
-    if (argc==3) {
-      owl_aim_chat_join(argv[2], 4);
-    } else {
-      owl_aim_chat_join(argv[2], atoi(argv[3]));
-    }
-    /* owl_function_makemsg("%s deleted as AIM buddy for %s", argv[2], owl_global_get_aim_screenname(&g)); */
-  } else {
-    owl_function_makemsg("join: currently the only supported protocol is 'aim'");
-  }
+    owl_function_makemsg("delbuddy: currently the only supported protocol is 'zephyr'");
+  }
+
   return(NULL);
 }
@@ -1539 +1432 @@
 
 
-char *owl_command_aaway(int argc, const char *const *argv, const char *buff)
-{
-  if ((argc==1) ||
-      ((argc==2) && !strcmp(argv[1], "on"))) {
-    owl_global_set_aaway_msg(&g, owl_global_get_aaway_msg_default(&g));
-    owl_function_aaway_on();
-    return NULL;
-  }
-
-  if (argc==2 && !strcmp(argv[1], "off")) {
-    owl_function_aaway_off();
-    return NULL;
-  }
-
-  if (argc==2 && !strcmp(argv[1], "toggle")) {
-    owl_function_aaway_toggle();
-    return NULL;
-  }
-
-  buff = skiptokens(buff, 1);
-  owl_global_set_aaway_msg(&g, buff);
-  owl_function_aaway_on();
-  return NULL;
-}
-
-
 char *owl_command_away(int argc, const char *const *argv, const char *buff)
 {
@@ -1573 +1440 @@
       (argc == 2 && !strcmp(argv[1], "on"))) {
     away_off = false;
-    owl_global_set_aaway_msg(&g, owl_global_get_aaway_msg_default(&g));
     owl_global_set_zaway_msg(&g, owl_global_get_zaway_msg_default(&g));
   } else if (argc == 2 && !strcmp(argv[1], "off")) {
@@ -1585 +1451 @@
 
   if (away_off) {
-    owl_function_aaway_off();
     owl_function_zaway_off();
     owl_perlconfig_perl_call_norv("BarnOwl::Hooks::_away_off", 0, NULL);
     owl_function_makemsg("Away messages off.");
   } else if (message != NULL) {
-    owl_global_set_aaway_msg(&g, message);
     owl_global_set_zaway_msg(&g, message);
-    owl_function_aaway_on();
     owl_function_zaway_on();
     owl_perlconfig_perl_call_norv("BarnOwl::Hooks::_away_on", 1, &message);
     owl_function_makemsg("Away messages set (%s).", message);
   } else {
-    owl_function_aaway_on();
     owl_function_zaway_on();
     owl_perlconfig_perl_call_norv("BarnOwl::Hooks::_away_on", 0, NULL);
@@ -2038 +1900 @@
   }
   return(NULL);
-}
-
-char *owl_command_aimwrite(int argc, const char *const *argv, const char *buff)
-{
-  char *message = NULL;
-  GString *recip = g_string_new("");
-  const char *const *myargv;
-  int myargc;
-  
-  if (!owl_global_is_aimloggedin(&g)) {
-    owl_function_error("You are not logged in to AIM.");
-    goto err;
-  }
-
-  /* Skip argv[0]. */
-  myargv = argv+1;
-  myargc = argc-1;
-  while (myargc) {
-    if (!strcmp(myargv[0], "-m")) {
-      if (myargc <= 1) {
-        owl_function_error("No message specified.");
-        goto err;
-      }
-      /* Once we have -m, gobble up everything else on the line */
-      myargv++;
-      myargc--;
-      message = g_strjoinv(" ", (char**)myargv);
-      break;
-    } else {
-      /* squish arguments together to make one screenname w/o spaces for now */
-      g_string_append(recip, myargv[0]);
-      myargv++;
-      myargc--;
-    }
-  }
-
-  if (recip->str[0] == '\0') {
-    owl_function_error("No recipient specified");
-    goto err;
-  }
-
-  if (message != NULL)
-    owl_function_aimwrite(recip->str, message, false);
-  else
-    owl_function_aimwrite_setup(recip->str);
- err:
-  g_string_free(recip, true);
-  g_free(message);
-  return NULL;
 }
 
@@ -2654 +2467 @@
 }
 
-char *owl_command_aimlogin(int argc, const char *const *argv, const char *buff)
-{
-  if ((argc<2) || (argc>3)) {
-    owl_function_makemsg("Wrong number of arguments to aimlogin command");
-    return(NULL);
-  }
-
-  /* if we get two arguments, ask for the password */
-  if (argc==2) {
-    owl_editwin *e = owl_function_start_password("AIM Password: ");
-    owl_editwin_set_cbdata(e, g_strdup(argv[1]), g_free);
-    owl_editwin_set_callback(e, owl_callback_aimlogin);
-    return(NULL);
-  } else {
-    owl_function_aimlogin(argv[1], argv[2]);
-  }
-
-  /* this is a test */
-  return(NULL);
-}
-
-char *owl_command_aimlogout(int argc, const char *const *argv, const char *buff)
-{
-  /* clear the buddylist */
-  owl_buddylist_clear(owl_global_get_buddylist(&g));
-
-  owl_aim_logout();
-  return(NULL);
-}
-
 CALLER_OWN char *owl_command_getstyle(int argc, const char *const *argv, const char *buff)
 {

configure.ac

@@ -176 +176 @@
 AX_APPEND_COMPILE_FLAGS([-Wno-format-zero-length],[AM_CFLAGS])
 
-AX_APPEND_COMPILE_FLAGS([-Wno-pointer-sign -Wno-empty-body -Wno-unused-value],[LIBFAIM_CFLAGS])
-
 AM_CONDITIONAL([ENABLE_ZCRYPT], [test "$HAVE_DES_STRING_TO_KEY" && dnl
                                  test "$HAVE_DES_KEY_SCHED" && dnl
@@ -194 +192 @@
 
 AC_SUBST([AM_CFLAGS])
-AC_SUBST([LIBFAIM_CFLAGS])
 
 AC_SUBST(XSUBPPDIR)
@@ -213 +210 @@
 AC_SUBST([abs_srcdir])
 
-AC_CONFIG_FILES([Makefile compat/Makefile libfaim/Makefile perl/Makefile perl/modules/Makefile])
+AC_CONFIG_FILES([Makefile compat/Makefile perl/Makefile perl/modules/Makefile])
 AC_OUTPUT

doc/advanced.txt

@@ -42 +42 @@
      realm         zephyr realm
      body          message body
-     type          message type ('zephyr', 'aim', 'admin')
+     type          message type ('zephyr', 'admin')
      direction     either 'in' 'out' or 'none'\n"
      login         either 'login' 'logout' or 'none'\n" 
@@ -103 +103 @@
 All owl::Message objects contain the following methods:
 
-    type      - returns the type of the message ("zephyr", "aim", "admin")
+    type      - returns the type of the message ("zephyr", "admin")
     direction - returns "in" or "out" for incoming or outgoing messages
     time      - returns a string of the time when the message showed up
@@ -126 +126 @@
 
     header      - returns the admin message header line  (admin)
-    is_personal - returns true if this is a personal message (aim,zephyr)
+    is_personal - returns true if this is a personal message (zephyr)
     is_private  - returns true if this was a private message (zephyr)
     login_tty   - returns the login tty for login messages (zephyr)

doc/intro.txt

@@ -8 +8 @@
 
 Owl is a tty, curses-based instant messaging client.  This is a quick
-guide to learning how to use it.  Currently Owl supports AIM & zephyr,
+guide to learning how to use it.  Currently Owl supports zephyr,
 but other messaging protocols, including Jabber, are on the way.  Some
 major features of owl include:
@@ -73 +73 @@
 If you wish to send to a class/instance pair simply supply -c and -i
 arguments to the zwrite command as you normally would.
-
-Sending an AIM message
-----------------------
-
-Before sending an AIM message you must login to AOL Instant Messenger.
-Use the 'aimlogin' command, with your screenname as an argument:
-
-     aimlogin <screenname>
-
-You will be prompted for your password, which you must enter.  Once
-you are successfully logged in you can send an AIM message by pressing
-the 'a' key, which will bring up an 'aimwrite' command:
-
-     aimwrite <screenname>
-
-Supply the screen name you wish to write to as an argument and then
-send the message just as you would send a zephyr, as described above.
 
 Manipulating Messages
@@ -256 +239 @@
      auto             Messages generated by automated programs
      out              Messages sent from you to another user
-     aim              AIM messages
      zephyr           Zephyr messages
      trash            "Trash" messages

functions.c

@@ -170 +170 @@
     "':sub @b(class)', and then type ':zwrite -c @b(class)' to send.\n\n"
 #endif
-    "@b(AIM:)\n"
-    "Log in to AIM with ':aimlogin @b(screenname)'. Use ':aimwrite @b(screenname)',\n"
-    "or 'a' and then the screen name, to send someone a message.\n\n"
     ;
 
@@ -239 +236 @@
 }
 
-/* Create an outgoing AIM message, returns a pointer to the created
- * message or NULL if we're not logged into AIM (and thus unable to
- * create the message).  Does not put it on the global queue.  Use
- * owl_global_messagequeue_addmsg() for that.
- */
-CALLER_OWN owl_message *owl_function_make_outgoing_aim(const char *body, const char *to)
-{
-  owl_message *m;
-
-  /* error if we're not logged into aim */
-  if (!owl_global_is_aimloggedin(&g)) return(NULL);
-  
-  m=g_slice_new(owl_message);
-  owl_message_create_aim(m,
-                         owl_global_get_aim_screenname(&g),
-                         to,
-                         body,
-                         OWL_MESSAGE_DIRECTION_OUT,
-                         0);
-  return(m);
-}
-
 /* Create an outgoing loopback message and return a pointer to it.
  * Does not append it to the global queue, use
@@ -325 +300 @@
 }
 
-void owl_function_aimwrite_setup(const char *to)
-{
-  owl_editwin *e;
-  /* TODO: We probably actually want an owl_aimwrite object like
-   * owl_zwrite. */
-  char *line = g_strdup_printf("aimwrite %s", to);
-  owl_function_write_setup("message");
-  e = owl_function_start_edit_win(line);
-  owl_editwin_set_cbdata(e, g_strdup(to), g_free);
-  owl_editwin_set_callback(e, &owl_callback_aimwrite);
-  g_free(line);
-}
-
 void owl_function_loopwrite_setup(void)
 {
@@ -436 +398 @@
   g_free(cryptmsg);
   g_free(old_msg);
-}
-
-void owl_callback_aimwrite(owl_editwin *e, bool success)
-{
-  if (!success) return;
-  char *to = owl_editwin_get_cbdata(e);
-  owl_function_aimwrite(to, owl_editwin_get_text(e), true);
-}
-
-void owl_function_aimwrite(const char *to, const char *msg, bool unwrap)
-{
-  int ret;
-  char *format_msg;
-  owl_message *m;
-
-  /* make a formatted copy of the message */
-  format_msg = g_strdup(msg);
-  if (unwrap)
-    owl_text_wordunwrap(format_msg);
-  
-  /* send the message */
-  ret=owl_aim_send_im(to, format_msg);
-  if (!ret) {
-    owl_function_makemsg("AIM message sent.");
-  } else {
-    owl_function_error("Could not send AIM message.");
-  }
-
-  /* create the outgoing message */
-  m=owl_function_make_outgoing_aim(msg, to);
-
-  if (m) {
-    owl_global_messagequeue_addmsg(&g, m);
-  } else {
-    owl_function_error("Could not create outgoing AIM message");
-  }
-
-  g_free(format_msg);
-}
-
-void owl_function_send_aimawymsg(const char *to, const char *msg)
-{
-  int ret;
-  char *format_msg;
-  owl_message *m;
-
-  /* make a formatted copy of the message */
-  format_msg=g_strdup(msg);
-  owl_text_wordunwrap(format_msg);
-  
-  /* send the message */
-  ret=owl_aim_send_awaymsg(to, format_msg);
-  if (!ret) {
-    /* owl_function_makemsg("AIM message sent."); */
-  } else {
-    owl_function_error("Could not send AIM message.");
-  }
-
-  /* create the message */
-  m=owl_function_make_outgoing_aim(msg, to);
-  if (m) {
-    owl_global_messagequeue_addmsg(&g, m);
-  } else {
-    owl_function_error("Could not create AIM message");
-  }
-  g_free(format_msg);
 }
 
@@ -918 +814 @@
 }
 
-void owl_callback_aimlogin(owl_editwin *e, bool success)
-{
-  if (!success) return;
-  char *user = owl_editwin_get_cbdata(e);
-  owl_function_aimlogin(user,
-                        owl_editwin_get_text(e));
-}
-
-void owl_function_aimlogin(const char *user, const char *passwd) {
-  int ret;
-
-  /* clear the buddylist */
-  owl_buddylist_clear(owl_global_get_buddylist(&g));
-
-  /* try to login */
-  ret=owl_aim_login(user, passwd);
-  if (ret) owl_function_makemsg("Warning: login for %s failed.\n", user);
-}
-
 void owl_function_suspend(void)
 {
@@ -969 +846 @@
 }
 
-void owl_function_aaway_toggle(void)
-{
-  if (!owl_global_is_aaway(&g)) {
-    owl_global_set_aaway_msg(&g, owl_global_get_aaway_msg_default(&g));
-    owl_function_aaway_on();
-  } else {
-    owl_function_aaway_off();
-  }
-}
-
-void owl_function_aaway_on(void)
-{
-  owl_global_set_aaway_on(&g);
-  /* owl_aim_set_awaymsg(owl_global_get_zaway_msg(&g)); */
-  owl_function_makemsg("AIM away set (%s)", owl_global_get_aaway_msg(&g));
-}
-
-void owl_function_aaway_off(void)
-{
-  owl_global_set_aaway_off(&g);
-  /* owl_aim_set_awaymsg(""); */
-  owl_function_makemsg("AIM away off");
-}
-
 bool owl_function_is_away(void)
 {
   return owl_global_is_zaway(&g) ||
-         owl_global_is_aaway(&g) ||
          owl_perlconfig_perl_call_bool("BarnOwl::Hooks::_get_is_away", 0, NULL);
 }
@@ -1017 +869 @@
   if (owl_global_get_newmsgproc_pid(&g)) {
     kill(owl_global_get_newmsgproc_pid(&g), SIGHUP);
-  }
-  
-  /* Quit AIM */
-  if (owl_global_is_aimloggedin(&g)) {
-    owl_aim_logout();
   }
 
@@ -1822 +1669 @@
     owl_fmtext_append_normal(&fm, "no\n");
   }
-  owl_fmtext_append_normal(&fm, "  AIM included       : yes\n");
   owl_fmtext_append_normal(&fm, "  Loopback included  : yes\n");
 
@@ -1833 +1679 @@
   owl_fmtext_append_normal(&fm, "no\n");
 #endif
-  
-
-  owl_fmtext_append_normal(&fm, "\nAIM Status:\n");
-  owl_fmtext_append_normal(&fm, "  Logged in: ");
-  if (owl_global_is_aimloggedin(&g)) {
-    owl_fmtext_append_normal(&fm, owl_global_get_aim_screenname(&g));
-    owl_fmtext_append_normal(&fm, "\n");
-  } else {
-    owl_fmtext_append_normal(&fm, "(not logged in)\n");
-  }
-
-  owl_fmtext_append_normal(&fm, "  Processing events: ");
-  if (owl_global_is_doaimevents(&g)) {
-    owl_fmtext_append_normal(&fm, "yes\n");
-  } else {
-    owl_fmtext_append_normal(&fm, "no\n");
-  }
 
   owl_function_popless_fmtext(&fm);
@@ -2446 +2275 @@
   if (f == NULL) {
     /* Couldn't make a filter for some reason. Return NULL. */
-    owl_function_error("Error creating filter '%s'", filtname);
-    g_free(filtname);
-    return NULL;
-  }
-
-  /* add it to the global list */
-  owl_global_add_filter(&g, f);
-
-  return(filtname);
-}
-
-/* Create a filter for AIM IM messages to or from the specified
- * screenname.  The name of the filter will be 'aimuser-<user>'.  If a
- * filter already exists with this name, no new filter will be
- * created.  This allows the configuration to override this function.
- * Returns the name of the filter, which the caller must free.
- */
-CALLER_OWN char *owl_function_aimuserfilt(const char *user)
-{
-  owl_filter *f;
-  char *argbuff, *filtname;
-  char *escuser;
-
-  /* name for the filter */
-  filtname=g_strdup_printf("aimuser-%s", user);
-
-  /* if it already exists then go with it.  This lets users override */
-  if (owl_global_get_filter(&g, filtname)) {
-    return filtname;
-  }
-
-  /* create the new-internal filter */
-  escuser = owl_text_quote(user, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
-
-  argbuff = g_strdup_printf(
-      "( type ^aim$ and ( ( sender ^%1$s$ and recipient ^%2$s$ ) or "
-      "( sender ^%2$s$ and recipient ^%1$s$ ) ) )",
-      escuser, owl_global_get_aim_screenname_for_filters(&g));
-  g_free(escuser);
-
-  f = owl_filter_new_fromstring(filtname, argbuff);
-  g_free(argbuff);
-
-  if (f == NULL) {
     owl_function_error("Error creating filter '%s'", filtname);
     g_free(filtname);
@@ -2606 +2391 @@
  * If the curmsg is a zephyr class message and type==1 then 
  *    return a filter name for the class and instance.
- * If the curmsg is a personal AIM message returna  filter
- *    name to the AIM conversation with that user 
  */
 CALLER_OWN char *owl_function_smartfilter(int type, int invert_related)
@@ -2633 +2416 @@
   if (owl_message_is_type_loopback(m)) {
     return(owl_function_typefilt("loopback"));
-  }
-
-  /* aim messages */
-  if (owl_message_is_type_aim(m)) {
-    if (owl_message_is_direction_in(m)) {
-      filtname=owl_function_aimuserfilt(owl_message_get_sender(m));
-    } else if (owl_message_is_direction_out(m)) {
-      filtname=owl_function_aimuserfilt(owl_message_get_recipient(m));
-    }
-    return(filtname);
   }
 
@@ -3070 +2843 @@
 
 /* Popup a buddylisting.  If filename is NULL use the default .anyone */
-void owl_function_buddylist(int aim, int zephyr, const char *filename)
-{
-  int i, j, idle;
+void owl_function_buddylist(int zephyr, const char *filename)
+{
+  int i;
   int interrupted = 0;
   owl_fmtext fm;
-  const owl_buddylist *bl;
-  const owl_buddy *b;
-  char *timestr;
 #ifdef HAVE_LIBZEPHYR
   int x;
@@ -3088 +2858 @@
 
   owl_fmtext_init_null(&fm);
-
-  /* AIM first */
-  if (aim && owl_global_is_aimloggedin(&g)) {
-    bl=owl_global_get_buddylist(&g);
-
-    owl_fmtext_append_bold(&fm, "AIM users logged in:\n");
-    /* we're assuming AIM for now */
-    j=owl_buddylist_get_size(bl);
-    for (i=0; i<j; i++) {
-      b=owl_buddylist_get_buddy_n(bl, i);
-      idle=owl_buddy_get_idle_time(b);
-      if (idle!=0) {
-        timestr=owl_util_format_minutes(idle);
-      } else {
-        timestr=g_strdup("");
-      }
-      owl_fmtext_appendf_normal(&fm, "  %-20.20s %-12.12s\n", owl_buddy_get_name(b), timestr);
-      g_free(timestr);
-    }
-  }
 
 #ifdef HAVE_LIBZEPHYR
@@ -3164 +2914 @@
 #endif
 
-  if (aim && zephyr) {
+  if (zephyr) {
     if (owl_perlconfig_is_function("BarnOwl::Hooks::_get_blist")) {
       char * perlblist = owl_perlconfig_execute("BarnOwl::Hooks::_get_blist()");
@@ -3508 +3258 @@
 }
 
-void owl_function_aimsearch_results(const char *email, GPtrArray *namelist)
-{
-  owl_fmtext fm;
-  int i;
-
-  owl_fmtext_init_null(&fm);
-  owl_fmtext_append_normal(&fm, "AIM screennames associated with ");
-  owl_fmtext_append_normal(&fm, email);
-  owl_fmtext_append_normal(&fm, ":\n");
-
-  for (i = 0; i < namelist->len; i++) {
-    owl_fmtext_append_normal(&fm, "  ");
-    owl_fmtext_append_normal(&fm, namelist->pdata[i]);
-    owl_fmtext_append_normal(&fm, "\n");
-  }
-
-  owl_function_popless_fmtext(&fm);
-  owl_fmtext_cleanup(&fm);
-}
-
 int owl_function_get_color_count(void)
 {

global.c

@@ -84 +84 @@
   _owl_global_init_windows(g);
 
-  g->aim_screenname=NULL;
-  g->aim_screenname_for_filters=NULL;
-  g->aim_loggedin=0;
-  owl_buddylist_init(&(g->buddylist));
-
   g->havezephyr=0;
-  g->haveaim=0;
-  g->ignoreaimlogin=0;
-  owl_global_set_no_doaimevents(g);
 
   owl_errqueue_init(&(g->errqueue));
@@ -646 +638 @@
 }
 
-/* AIM stuff */
-
-int owl_global_is_aimloggedin(const owl_global *g)
-{
-  if (g->aim_loggedin) return(1);
-  return(0);
-}
-
-const char *owl_global_get_aim_screenname(const owl_global *g)
-{
-  if (owl_global_is_aimloggedin(g)) {
-    return (g->aim_screenname);
-  }
-  return("");
-}
-
-const char *owl_global_get_aim_screenname_for_filters(const owl_global *g)
-{
-  if (owl_global_is_aimloggedin(g)) {
-    return (g->aim_screenname_for_filters);
-  }
-  return("");
-}
-
-void owl_global_set_aimloggedin(owl_global *g, const char *screenname)
-{
-  char *sn_escaped;
-  g->aim_loggedin=1;
-  if (g->aim_screenname) g_free(g->aim_screenname);
-  if (g->aim_screenname_for_filters) g_free(g->aim_screenname_for_filters);
-  g->aim_screenname=g_strdup(screenname);
-  sn_escaped = owl_text_quote(screenname, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
-  g->aim_screenname_for_filters = owl_arg_quote(sn_escaped);
-  g_free(sn_escaped);
-}
-
-void owl_global_set_aimnologgedin(owl_global *g)
-{
-  g->aim_loggedin=0;
-}
-
-bool owl_global_is_doaimevents(const owl_global *g)
-{
-  return g->aim_event_source != NULL;
-}
-
-void owl_global_set_doaimevents(owl_global *g)
-{
-  if (g->aim_event_source)
-    return;
-  g->aim_event_source = owl_aim_event_source_new(owl_global_get_aimsess(g));
-  g_source_attach(g->aim_event_source, NULL);
-}
-
-void owl_global_set_no_doaimevents(owl_global *g)
-{
-  if (!g->aim_event_source)
-    return;
-  g_source_destroy(g->aim_event_source);
-  g_source_unref(g->aim_event_source);
-  g->aim_event_source = NULL;
-}
-
-aim_session_t *owl_global_get_aimsess(owl_global *g)
-{
-  return(&(g->aimsess));
-}
-
-aim_conn_t *owl_global_get_bosconn(owl_global *g)
-{
-  return(&(g->bosconn));
-}
-
-void owl_global_set_bossconn(owl_global *g, aim_conn_t *conn)
-{
-  g->bosconn=*conn;
-}
-
 /* message queue */
 
@@ -750 +664 @@
 }
 
-owl_buddylist *owl_global_get_buddylist(owl_global *g)
-{
-  return(&(g->buddylist));
-}
-  
 /* style */
 
@@ -781 +690 @@
   owl_dict_insert_element(&(g->styledict), owl_style_get_name(s),
                           s, (void (*)(void *))owl_style_delete);
-}
-
-void owl_global_set_haveaim(owl_global *g)
-{
-  g->haveaim=1;
-}
-
-int owl_global_is_haveaim(const owl_global *g)
-{
-  if (g->haveaim) return(1);
-  return(0);
-}
-
-void owl_global_set_ignore_aimlogin(owl_global *g)
-{
-    g->ignoreaimlogin = 1;
-}
-
-void owl_global_unset_ignore_aimlogin(owl_global *g)
-{
-    g->ignoreaimlogin = 0;
-}
-
-int owl_global_is_ignore_aimlogin(const owl_global *g)
-{
-    return g->ignoreaimlogin;
 }
 
@@ -867 +750 @@
     { "reply-lockout", "class ^mail$ or class ^filsrv$" },
     { "out", "direction ^out$" },
-    { "aim", "type ^aim$" },
     { "zephyr", "type ^zephyr$" },
     { "none", "false" },

help.c

@@ -52 +52 @@
      "\n"
      "    z             Start a zwrite command\n"
-     "    a             Start an aimwrite command\n"
      "    r             Reply to the current message\n"
      "    R             Reply to sender\n"
@@ -64 +63 @@
      "    !             Invert the current view\n"
      "\n"
-     "    l             Print a zephyr/AIM buddy listing\n"
+     "    l             Print a zephyr buddy listing\n"
      "    A             Toggle away\n"
      "    o             Toggle one-line display mode\n"
@@ -88 +87 @@
      "\n"
      "    zwrite        Send a zephyr\n"
-     "    aimlogin      Login to AIM\n"
-     "    aimwrite      Send an AIM message\n"
      "\n"
-     "    addbuddy      Add a zephyr or AIM buddy\n"
+     "    addbuddy      Add a zephyr buddy\n"
      "    zaway         Turn zaway on or off, or set the message\n"
      "    zlocate       Locate a user\n"
      "    subscribe     Subscribe to a zephyr class or instance\n"
      "    unsubscribe   Unsubscribe to a zephyr class or instance\n"
-     "    blist         Print a list of zephyr and AIM buddies logged in\n"
+     "    blist         Print a list of zephyr buddies logged in\n"
      "    search        Search for a text string\n"
      "\n"
@@ -110 +107 @@
      "    zlog          Send a login or logout notification\n"
      "    zlist         Print a list of zephyr buddies logged in\n"
-     "    alist         Print a list of AIM buddies logged in\n"
      "    info          Print detailed information about the current message\n"
      "    filter        Create a message filter\n"

keys.c

@@ -317 +317 @@
 
   BIND_CMD("z",   "start-command zwrite ", "start a zwrite command");
-  BIND_CMD("a",   "start-command aimwrite ", "start an aimwrite command");
   BIND_CMD("r",   "reply",            "reply to the current message");
   BIND_CMD("R",   "reply sender",     "reply to sender of the current message");

message.c

@@ -371 +371 @@
 }
 
-void owl_message_set_type_aim(owl_message *m)
-{
-  owl_message_set_attribute(m, "type", "AIM");
-}
-
 void owl_message_set_type(owl_message *m, const char* type)
 {
@@ -395 +390 @@
 {
   return owl_message_is_type(m, "zephyr");
-}
-
-int owl_message_is_type_aim(const owl_message *m)
-{
-  return owl_message_is_type(m, "aim");
 }
 
@@ -686 +676 @@
 }
 
-
-/* if loginout == -1 it's a logout message
- *                 0 it's not a login/logout message
- *                 1 it's a login message
- */
-void owl_message_create_aim(owl_message *m, const char *sender, const char *recipient, const char *text, int direction, int loginout)
-{
-  owl_message_init(m);
-  owl_message_set_body(m, text);
-  owl_message_set_sender(m, sender);
-  owl_message_set_recipient(m, recipient);
-  owl_message_set_type_aim(m);
-
-  if (direction==OWL_MESSAGE_DIRECTION_IN) {
-    owl_message_set_direction_in(m);
-  } else if (direction==OWL_MESSAGE_DIRECTION_OUT) {
-    owl_message_set_direction_out(m);
-  }
-
-  /* for now all messages that aren't loginout are private */
-  if (!loginout) {
-    owl_message_set_isprivate(m);
-  }
-
-  if (loginout==-1) {
-    owl_message_set_islogout(m);
-  } else if (loginout==1) {
-    owl_message_set_islogin(m);
-  }
-}
 
 void owl_message_create_admin(owl_message *m, const char *header, const char *text)

owl.c

@@ -187 +187 @@
       if (owl_message_is_type_zephyr(m)) {
         owl_zephyr_zaway(m);
-      } else if (owl_message_is_type_aim(m)) {
-        if (owl_message_is_private(m)) {
-          owl_function_send_aimawymsg(owl_message_get_sender(m), owl_global_get_zaway_msg(&g));
-        }
       }
     }
@@ -504 +500 @@
   owl_global_set_startupargs(&g, argc_copy, argv_copy);
   g_strfreev(argv_copy);
-  owl_global_set_haveaim(&g);
 
   owl_register_signal_handlers();
@@ -564 +559 @@
                   owl_global_get_filter(&g, "all"),
                   owl_global_get_style_by_name(&g, "default"));
-
-  /* AIM init */
-  owl_function_debugmsg("startup: doing AIM initialization");
-  owl_aim_init();
 
   /* execute the startup function in the configfile */

owl.h

@@ -35 +35 @@
 #include <termios.h>
 #include <unistd.h>
-#include "libfaim/aim.h"
 #include <wchar.h>
 #include <glib.h>
@@ -108 +107 @@
 #define OWL_EDITWIN_STYLE_MULTILINE 0
 #define OWL_EDITWIN_STYLE_ONELINE   1
-
-#define OWL_PROTOCOL_ZEPHYR         0
-#define OWL_PROTOCOL_AIM            1
-#define OWL_PROTOCOL_JABBER         2
-#define OWL_PROTOCOL_ICQ            3
-#define OWL_PROTOCOL_YAHOO          4
-#define OWL_PROTOCOL_MSN            5
 
 #define OWL_MESSAGE_DIRECTION_NONE  0
@@ -178 +170 @@
 
 #define OWL_DEFAULT_ZAWAYMSG    "I'm sorry, but I am currently away from the terminal and am\nnot able to receive your message.\n"
-#define OWL_DEFAULT_AAWAYMSG    "I'm sorry, but I am currently away from the terminal and am\nnot able to receive your message.\n"
 
 #define OWL_CMD_ALIAS_SUMMARY_PREFIX "command alias to: "
@@ -492 +483 @@
   int       kpstackpos;         /* location in stack (-1 = none) */
 } owl_keyhandler;
-
-typedef struct _owl_buddy {
-  int proto;
-  char *name;
-  int isidle;
-  int idlesince;
-} owl_buddy;
-
-typedef struct _owl_buddylist {
-  GPtrArray *buddies;
-} owl_buddylist;
 
 typedef struct _owl_zbuddylist {
@@ -569 +549 @@
   pid_t newmsgproc_pid;
   owl_regex search_re;
-  aim_session_t aimsess;
-  aim_conn_t bosconn;
-  int aim_loggedin;         /* true if currently logged into AIM */
-  GSource *aim_event_source; /* where we get our AIM events from */
-  char *aim_screenname;     /* currently logged in AIM screen name */
-  char *aim_screenname_for_filters;     /* currently logged in AIM screen name */
-  owl_buddylist buddylist;  /* list of logged in AIM buddies */
-  GQueue *messagequeue;     /* for queueing up aim and other messages */
+  GQueue *messagequeue;     /* for queueing up messages */
   owl_dict styledict;       /* global dictionary of available styles */
   char *response;           /* response to the last question asked */
   int havezephyr;
-  int haveaim;
-  int ignoreaimlogin;
   owl_zbuddylist zbuddies;
   GList *zaldlist;
   int pseudologin_notify;
   struct termios startup_tio;
-  guint aim_nop_timer;
   int load_initial_subs;
   FILE *debug_file;

perl/Makefile.am

@@ -2 +2 @@
 nobase_dist_pkgdata_DATA = \
         lib/BarnOwl.pm \
-        lib/BarnOwl/Complete/AIM.pm \
         lib/BarnOwl/Complete/Client.pm \
         lib/BarnOwl/Complete/Filter.pm \
@@ -17 +16 @@
         lib/BarnOwl/MainLoopCompatHook.pm \
         lib/BarnOwl/Message.pm \
-        lib/BarnOwl/Message/AIM.pm \
         lib/BarnOwl/Message/Admin.pm \
         lib/BarnOwl/Message/Generic.pm \

perl/lib/BarnOwl/Complete/Filter.pm

@@ -36 +36 @@
     body      => undef,
     hostname  => undef,
-    type      => sub { qw(zephyr aim admin); },
+    type      => sub { qw(zephyr admin); },
     direction => sub { qw(in out none); },
     login     => sub { qw(login logout none); },

perl/lib/BarnOwl/Logging.pm

@@ -75 +75 @@
             summary     => 'enable logging of login notifications',
             description => "When this is enabled, BarnOwl will log login and logout notifications\n"
-                         . "for AIM, zephyr, or other protocols.  If disabled BarnOwl will not log\n"
+                         . "for zephyr or other protocols.  If disabled BarnOwl will not log\n"
                          . "login or logout notifications."
         });

perl/lib/BarnOwl/Message.pm

@@ -7 +7 @@
 
 use BarnOwl::Message::Admin;
-use BarnOwl::Message::AIM;
 use BarnOwl::Message::Generic;
 use BarnOwl::Message::Loopback;
@@ -43 +42 @@
 sub is_generic  { return (shift->{"type"} eq "generic"); }
 sub is_zephyr   { return (shift->{"type"} eq "zephyr"); }
-sub is_aim      { return (shift->{"type"} eq "AIM"); }
+sub is_aim      { return ''; }
 sub is_jabber   { return (shift->{"type"} eq "jabber"); }
 sub is_icq      { return (shift->{"type"} eq "icq"); }

t/completion.t

@@ -293 +293 @@
 
 test_complete('type ', '',
-              [qw[admin aim zephyr]],
+              [qw[admin zephyr]],
               \&complete_filter_expr);
 

variable.c

@@ -161 +161 @@
                "Enable printing of login notifications",
                "When this is enabled, BarnOwl will print login and logout notifications\n"
-               "for AIM, zephyr, or other protocols.  If disabled BarnOwl will not print\n"
+               "for zephyr or other protocols.  If disabled BarnOwl will not print\n"
                "login or logout notifications.\n");
 
@@ -233 +233 @@
                  "default zaway message", "" );
 
-  OWLVAR_BOOL_FULL( "aaway" /* %OwlVarStub */, 0,
-                    "Set AIM away status",
-                    "",
-                    NULL, owl_variable_aaway_set, NULL);
-
-  OWLVAR_STRING( "aaway_msg" /* %OwlVarStub */, 
-                 OWL_DEFAULT_AAWAYMSG,
-                 "AIM away msg for responding when away", "" );
-
-  OWLVAR_STRING( "aaway_msg_default" /* %OwlVarStub */, 
-                 OWL_DEFAULT_AAWAYMSG,
-                 "default AIM away message", "" );
-
   OWLVAR_STRING( "view_home" /* %OwlVarStub */, "all",
                  "home view to switch to after 'X' and 'V'", 
@@ -288 +275 @@
                  "Zephyr messages be no wider than 70 columns.\n");
 
-  OWLVAR_INT( "aim_ignorelogin_timer" /* %OwlVarStub */, 15,
-              "number of seconds after AIM login to ignore login messages",
-              "This specifies the number of seconds to wait after an\n"
-              "AIM login before allowing the receipt of AIM login notifications.\n"
-              "By default this is set to 15.  If you would like to view login\n"
-              "notifications of buddies as soon as you login, set it to 0 instead.");
-
-              
   OWLVAR_INT_FULL( "typewinsize" /* %OwlVarStub:typwin_lines */, 
                    OWL_TYPWIN_SIZE,
@@ -461 +440 @@
 }
 
-/* When 'aaway' is changed, need to notify the AIM server */
-int owl_variable_aaway_set(owl_variable *v, bool newval)
-{
-  if (newval) {
-    owl_aim_set_awaymsg(owl_global_get_aaway_msg(&g));
-  } else {
-    owl_aim_set_awaymsg("");
-  }
-  return owl_variable_bool_set_default(v, newval);
-}
-
 int owl_variable_colorztext_set(owl_variable *v, bool newval)
 {