Changes in / [e2cbbbe:9a7b4f2]

Files:

• commands.c (modified) (16 diffs)
• configure.ac (modified) (2 diffs)
• editwin.c (modified) (11 diffs)
• functions.c (modified) (20 diffs)
• global.c (modified) (8 diffs)
• keybinding.c (modified) (3 diffs)
• keymap.c (modified) (1 diff)
• keys.c (modified) (1 diff)
• m4/ax_prog_perl_modules.m4 (deleted)
• owl.c (modified) (1 diff)
• owl.h (modified) (2 diffs)
• perl/lib/BarnOwl/Style/Default.pm (modified) (2 diffs)
• perlconfig.c (modified) (1 diff)
• perlglue.xs (modified) (13 diffs)
• popexec.c (modified) (3 diffs)
• scripts/add-changelog (modified) (1 diff)
• scripts/do-release (modified) (2 diffs)
• scripts/locker-build (modified) (2 diffs)
• variable.c (modified) (1 diff)
• zephyr.c (modified) (2 diffs)

commands.c

@@ -1 @@
-#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -92 +91 @@
               "Use 'show keymaps' to see the existing keymaps.\n"
               "Key sequences may be things like M-C-t or NPAGE.\n\n"
-              "Ex.: bindkey recv C-b command zwrite -c barnowl"
-              "SEE ALSO: bindkey"),
-
-  OWLCMD_ARGS("unbindkey", owl_command_unbindkey, OWL_CTX_ANY,
-              "removes a binding in a keymap",
-              "bindkey <keymap> <keyseq>",
-              "Removes a binding of a key sequence within a keymap.\n"
-              "Use 'show keymaps' to see the existing keymaps.\n"
-              "Ex.: unbindkey recv H"
-              "SEE ALSO: bindkey"),
+              "Ex.: bindkey recv C-b command zwrite -c barnowl"),
 
   OWLCMD_ARGS("zwrite", owl_command_zwrite, OWL_CTX_INTERACTIVE,
@@ -593 +583 @@
   OWLCMD_ARGS("smartnarrow", owl_command_smartnarrow, OWL_CTX_INTERACTIVE,
               "view only messages similar to the current message",
-              "smartnarrow [-i | --instance]  [-r | --relatde]",
+              "smartnarrow [-i | --instance]",
               "If the curmsg is a personal message narrow\n"
               "   to the conversation with that user.\n"
@@ -601 +591 @@
               "    to the class.\n"
               "If the curmsg is a class message and '-i' is specified\n"
-              "    then narrow to the class and instance.\n"
-              "If '-r' or '--related' is specified, behave as though the\n"
-              "    'narrow-related' variable was inverted."),
+              "    then narrow to the class and instance.\n"),
 
   OWLCMD_ARGS("smartfilter", owl_command_smartfilter, OWL_CTX_INTERACTIVE,
@@ -909 +897 @@
                   "", ""),
 
-  OWLCMD_ALIAS   ("editline:done", "edit:done"),
-  OWLCMD_ALIAS   ("editresponse:done", "edit:done"),
+  OWLCMD_VOID_CTX("editline:done", owl_command_editline_done, 
+                  OWL_CTX_EDITLINE,
+                  "completes the command (eg, executes command being composed)",
+                  "", ""),
+
+  OWLCMD_VOID_CTX("editresponse:done", owl_command_editresponse_done, 
+                  OWL_CTX_EDITRESPONSE,
+                  "completes the response to a question",
+                  "", ""),
 
   OWLCMD_VOID_CTX("edit:move-up-line", owl_editwin_key_up, 
@@ -923 +918 @@
 
   OWLCMD_VOID_CTX("edit:done", owl_command_edit_done, 
-                  OWL_CTX_EDIT,
-                  "Finishes entering text in the editwin.",
+                  OWL_CTX_EDITMULTI,
+                  "completes the command (eg, sends message being composed)",
                   "", ""),
 
@@ -1241 +1236 @@
       argc-=2; argv+=2; 
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter")) {
-      filter = owl_function_smartfilter(0, 0);
+      filter = owl_function_smartfilter(0);
       argc-=2; argv+=2; 
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter-instance")) {
-      filter = owl_function_smartfilter(1, 0);
+      filter = owl_function_smartfilter(1);
       argc-=2; argv+=2; 
     } else {
@@ -1271 +1266 @@
       argc-=2; argv+=2; 
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter")) {
-      filter = owl_function_smartfilter(0, 0);
+      filter = owl_function_smartfilter(0);
       argc-=2; argv+=2; 
     } else if (argc>=2 && !strcmp(argv[1], "--smart-filter-instance")) {
-      filter = owl_function_smartfilter(1, 0);
+      filter = owl_function_smartfilter(1);
       argc-=2; argv+=2;  
    } else {
@@ -1290 +1285 @@
   char *filtname = NULL;
 
-  char opt;
-  int instance = 0, related = 0, i;
-  char **tmp_argv = owl_malloc(sizeof(char *) * argc);
-
-  for (i = 0; i < argc; i++)
-    tmp_argv[i] = owl_strdup(argv[i]);
-
-  static struct option options[] = {
-    {"instance", 0, 0, 'i'},
-    {"related",  0, 0, 'r'},
-    {NULL,       0, 0, 0}};
-  while ((opt = getopt_long(argc, tmp_argv, "ir", options, NULL)) != -1) {
-    switch (opt) {
-      case 'i':
-        instance = 1;
-        break;
-      case 'r':
-        related = 1;
-        break;
-      default:
-        owl_function_makemsg("Wrong number of arguments for %s (%c)", argv[0], opt);
-        goto done;
-    }
-  }
-
-  for (i = 0; i < argc; i++)
-    owl_free(tmp_argv[i]);
-  owl_free(tmp_argv);
-
-  filtname = owl_function_smartfilter(instance, related);
-
+  if (argc == 1) {
+    filtname = owl_function_smartfilter(0);
+  } else if (argc == 2 && (!strcmp(argv[1], "-i") || !strcmp(argv[1], "--instance"))) {
+    filtname = owl_function_smartfilter(1);
+  } else {
+    owl_function_makemsg("Wrong number of arguments for %s", argv[0]);    
+  }
   if (filtname) {
     owl_function_change_currentview_filter(filtname);
     owl_free(filtname);
   }
-
-done:
-  optind = 0; /* reset getopt */
   return NULL;
 }
@@ -1336 +1304 @@
 
   if (argc == 1) {
-    filtname = owl_function_smartfilter(0, 0);
+    filtname = owl_function_smartfilter(0);
   } else if (argc == 2 && (!strcmp(argv[1], "-i") || !strcmp(argv[1], "--instance"))) {
-    filtname = owl_function_smartfilter(1, 0);
+    filtname = owl_function_smartfilter(1);
   } else {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);    
@@ -1704 +1672 @@
   return NULL;
 }
-
-
-char *owl_command_unbindkey(int argc, const char *const *argv, const char *buf)
-{
-  owl_keymap *km;
-  int ret;
-
-  if (argc < 3) {
-    owl_function_makemsg("Usage: bindkey <keymap> <binding>");
-    return NULL;
-  }
-  km = owl_keyhandler_get_keymap(owl_global_get_keyhandler(&g), argv[1]);
-  if (!km) {
-    owl_function_makemsg("No such keymap '%s'", argv[1]);
-    return NULL;
-  }
-  ret = owl_keymap_remove_binding(km, argv[2]);
-  if (ret == -1) {
-    owl_function_makemsg("Unable to unbind '%s' in keymap '%s'.",
-                         argv[2], argv[1]);
-    return NULL;
-  } else if (ret == -2) {
-    owl_function_makemsg("No such binding '%s' in keymap '%s'.",
-                         argv[2], argv[1]);
-  }
-  return NULL;
-}
-
 
 void owl_command_quit(void)
@@ -2280 +2220 @@
     return NULL;
   }
-  filtname = owl_function_classinstfilt(argv[1], NULL, owl_global_is_narrow_related(&g));
+  filtname = owl_function_classinstfilt(argv[1], NULL);
   owl_function_change_currentview_filter(filtname);
   owl_free(filtname);
@@ -2392 +2332 @@
   }
 
-  filtname=owl_function_classinstfilt(argv[1], NULL, owl_global_is_narrow_related(&g));
+  filtname=owl_function_classinstfilt(argv[1], NULL);
   (void) owl_function_color_filter(filtname, argv[2], (argc == 4 ? argv[3] : NULL));
   return NULL;
@@ -2584 +2524 @@
   /* 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, owl_strdup(argv[1]), owl_free);
-    owl_editwin_set_callback(e, owl_callback_aimlogin);
+    owl_global_set_buffercommand(&g, argv[1]);
+    owl_global_set_buffercallback(&g, &owl_callback_aimlogin);
+    owl_function_start_password("AIM Password: ");
     return(NULL);
   } else {
@@ -2715 +2655 @@
   }
 
+  owl_editwin_fullclear(e);
   owl_global_set_needrefresh(&g);
+  owl_global_set_typwin_inactive(&g);
+  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_ONELINE, NULL);
+
   owl_global_pop_context(&g);
-
-  owl_global_set_typwin_inactive(&g);
-  owl_editwin_delete(e);
 }
 
@@ -2769 +2710 @@
 }
 
+void owl_command_editline_done(owl_editwin *e)
+{
+  owl_history *hist=owl_editwin_get_history(e);
+  char *rv, *cmd;
+
+  owl_history_store(hist, owl_editwin_get_text(e));
+  owl_history_reset(hist);
+  owl_global_set_typwin_inactive(&g);
+  owl_global_pop_context(&g);
+  cmd = owl_strdup(owl_editwin_get_text(e));
+  owl_editwin_fullclear(e);
+  rv = owl_function_command(cmd);
+  owl_free(cmd);
+
+  owl_global_set_needrefresh(&g);
+
+  if (rv) {
+    owl_function_makemsg("%s", rv);
+    owl_free(rv);
+  }
+}
+
+
+void owl_command_editresponse_done(owl_editwin *e)
+{
+  owl_function_run_buffercommand();
+
+  owl_global_set_typwin_inactive(&g);
+  owl_global_pop_context(&g);
+  owl_editwin_fullclear(e);
+  owl_global_set_needrefresh(&g);
+}
+
+
 void owl_command_edit_done(owl_editwin *e)
 {
   owl_history *hist=owl_editwin_get_history(e);
 
-  if (hist) {
-    owl_history_store(hist, owl_editwin_get_text(e));
-    owl_history_reset(hist);
-  }
-
+  owl_history_store(hist, owl_editwin_get_text(e));
+  owl_history_reset(hist);
+
+  owl_function_run_buffercommand();
+  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_ONELINE, NULL);
+  owl_editwin_fullclear(e);
   owl_global_set_typwin_inactive(&g);
   owl_global_pop_context(&g);
   owl_global_set_needrefresh(&g);
-
-  owl_editwin_do_callback(e);
-  owl_editwin_delete(e);
 }
 

configure.ac

@@ -98 +98 @@
 AC_MSG_NOTICE([Adding perl LIBS ${FOO}])
 LIBS=${LIBS}\ ${FOO}
-AC_CHECK_LIB([perl], [perl_alloc],, AC_MSG_ERROR([No libperl found]))
-
-AX_PROG_PERL_MODULES([Class::Accessor::Fast],,
-                     [AC_MSG_ERROR([cannot find perl module Class::Accessor::Fast.])])
-AX_PROG_PERL_MODULES([PAR],,
-                     [AC_MSG_WARN([PAR.pm not found. Loadable modules will be disabled.])])
 
 dnl Add CFLAGS and LDFLAGS for glib-2.0
@@ -141 +135 @@
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-AC_CHECK_PROG([HAVE_ZIP], [zip], [yes], [no])
-if test "x${HAVE_ZIP}" = "xno"; then
-   AC_MSG_ERROR([cannot find a 'zip' binary.])
-fi
 
 AC_CONFIG_FILES([Makefile libfaim/Makefile perl/Makefile perl/modules/Makefile])

editwin.c

@@ -35 +35 @@
   oe_excursion *excursions;
 
+  char *command;
   void (*callback)(struct _owl_editwin*);
-  void (*destroy_cbdata)(void *);
   void *cbdata;
 };
@@ -45 +45 @@
 static void oe_restore_excursion(owl_editwin *e, oe_excursion *x);
 static void oe_restore_mark_only(owl_editwin *e, oe_excursion *x);
+static int oe_count_glyphs(const char *s);
 static int oe_char_width(gunichar c, int column);
 static int oe_region_width(owl_editwin *e, int start, int end, int width);
@@ -57 +58 @@
 static int oe_copy_region(owl_editwin *e);
 static char *oe_chunk(owl_editwin *e, int start, int end);
-static void oe_destroy_cbdata(owl_editwin *e);
 
 #define INCR 4096
@@ -63 +63 @@
 #define WHITESPACE " \n\t"
 
-static owl_editwin *owl_editwin_allocate(void)
+owl_editwin *owl_editwin_allocate(void)
 {
   owl_editwin *e;
@@ -75 +75 @@
   owl_free(e->buff);
   owl_free(e->killbuf);
+  owl_free(e->command);
   /* just in case someone forgot to clean up */
   while (e->excursions) {
     oe_release_excursion(e, e->excursions);
   }
-  oe_destroy_cbdata(e);
 
   owl_free(e);
+}
+
+static int oe_count_glyphs(const char *s)
+{
+  int count = 0;
+  const char *p;
+
+  for(p = s; *p != 0; p = g_utf8_find_next_char(p, NULL))
+    if (!g_unichar_ismark(g_utf8_get_char(p)))
+      count++;
+
+  return count;
 }
 
@@ -104 +116 @@
 }
 
-static void _owl_editwin_init(owl_editwin *e,
-                              WINDOW *win,
-                              int winlines,
-                              int wincols,
-                              int style,
-                              owl_history *hist)
+/* initialize the editwin e.
+ * 'win' is an already initialzed curses window that will be used by editwin
+ */
+void owl_editwin_init(owl_editwin *e, WINDOW *win, int winlines, int wincols, int style, owl_history *hist)
 {
   e->buff=owl_malloc(INCR);
@@ -135 +145 @@
   e->echochar='\0';
 
+  /* We get initialized multiple times, but we need to hold on to
+     the callbacks, so we can't NULL them here. */
+  /*
+    e->command = NULL;
+    e->callback = NULL;
+    e->cbdata = NULL;
+  */
   if (win) werase(win);
-}
-
-owl_editwin *owl_editwin_new(WINDOW *win, int winlines, int wincols, int style, owl_history *hist)
-{
-  owl_editwin *e = owl_editwin_allocate();
-
-  _owl_editwin_init(e, win, winlines, wincols, style, hist);
-  return e;
 }
 
@@ -179 +188 @@
 }
 
+void owl_editwin_set_command(owl_editwin *e, const char *command)
+{
+  if(e->command) owl_free(e->command);
+  e->command = owl_strdup(command);
+}
+
+const char *owl_editwin_get_command(owl_editwin *e)
+{
+  if(e->command) return e->command;
+  return "";
+}
+
 void owl_editwin_set_callback(owl_editwin *e, void (*cb)(owl_editwin*))
 {
@@ -189 +210 @@
 }
 
-static void oe_destroy_cbdata(owl_editwin *e) {
-  if (e->destroy_cbdata)
-    e->destroy_cbdata(e->cbdata);
-  e->cbdata = NULL;
-  e->destroy_cbdata = NULL;
-}
-
-void owl_editwin_set_cbdata(owl_editwin *e, void *data, void (*destroy)(void *))
-{
-  oe_destroy_cbdata(e);
+void owl_editwin_set_cbdata(owl_editwin *e, void *data)
+{
   e->cbdata = data;
-  e->destroy_cbdata = destroy;
 }
 
@@ -247 +259 @@
 }
 
+void owl_editwin_new_style(owl_editwin *e, int newstyle, owl_history *h)
+{
+  e->hist = h;
+
+  if (e->style==newstyle) return;
+
+  if (newstyle==OWL_EDITWIN_STYLE_MULTILINE) {
+    e->style=newstyle;
+  } else if (newstyle==OWL_EDITWIN_STYLE_ONELINE) {
+    e->style=newstyle;
+
+    /* nuke everything after the first line */
+    owl_editwin_move_to_top(e);
+    owl_editwin_move_to_end_of_line(e);
+    owl_editwin_replace(e, oe_count_glyphs(e->buff + e->index),  "");
+  }
+}
+
+/* completly reinitialize the buffer */
+void owl_editwin_fullclear(owl_editwin *e)
+{
+  owl_free(e->buff);
+  owl_editwin_init(e, e->curswin, e->winlines, e->wincols, e->style, e->hist);
+}
+
 /* clear all text except for locktext and put the cursor at the
  * beginning
@@ -265 +302 @@
 
   owl_free(e->buff);
-  _owl_editwin_init(e, e->curswin, e->winlines, e->wincols, e->style, e->hist);
+  owl_editwin_init(e, e->curswin, e->winlines, e->wincols, e->style, e->hist);
 
   if (lock > 0) {

functions.c

@@ -278 +278 @@
 }
 
-void owl_function_start_edit_win(const char *line, void (*callback)(owl_editwin *), void *data, void (*cleanup)(void *))
+void owl_function_start_edit_win(const char *line, void (*callback)(owl_editwin *), void *data)
 {
   owl_editwin *e;
@@ -284 +284 @@
 
   /* create and setup the editwin */
-  e = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_MULTILINE,
-                                   owl_global_get_msg_history(&g));
+  e = owl_global_get_typwin(&g);
+  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_MULTILINE,
+                        owl_global_get_msg_history(&g));
+  owl_editwin_clear(e);
   owl_editwin_set_dotsend(e);
   s = owl_sprintf("----> %s\n", line);
@@ -291 +293 @@
   owl_free(s);
 
-  owl_editwin_set_cbdata(e, data, cleanup);
-  owl_editwin_set_callback(e, callback);
+  /* make it active */
+  owl_global_set_typwin_active(&g);
+
+  owl_editwin_set_cbdata(owl_global_get_typwin(&g), data);
+  owl_global_set_buffercallback(&g, callback);
   owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti");
 }
@@ -308 +313 @@
                          noun);
 
-  owl_function_start_edit_win(line, callback,
-                              owl_strdup(line),
-                              owl_free);
+  owl_function_start_edit_win(line, callback, NULL);
+  owl_global_set_buffercommand(&g, line);
 }
 
@@ -346 +350 @@
 
 void owl_callback_zwrite(owl_editwin *e) {
-  char *command = owl_editwin_get_cbdata(e);
-  owl_function_zwrite(command,
+  owl_function_zwrite(owl_editwin_get_command(e),
                       owl_editwin_get_text(e));
 }
@@ -456 +459 @@
 
 void owl_callback_aimwrite(owl_editwin *e) {
-  char *command = owl_editwin_get_cbdata(e);
-  owl_function_aimwrite(command,
+  owl_function_aimwrite(owl_editwin_get_command(e),
                         owl_editwin_get_text(e));
 }
@@ -892 +894 @@
 
 void owl_callback_aimlogin(owl_editwin *e) {
-  char *user = owl_editwin_get_cbdata(e);
-  owl_function_aimlogin(user,
+  owl_function_aimlogin(owl_editwin_get_command(e),
                         owl_editwin_get_text(e));
 }
@@ -1192 +1193 @@
 {
   owl_global_set_resize_pending(&g);
+}
+
+void owl_function_run_buffercommand(void)
+{
+  owl_editwin_do_callback(owl_global_get_typwin(&g));
 }
 
@@ -1911 +1917 @@
 }
 
-void owl_callback_command(owl_editwin *e)
-{
-  char *rv;
-  const char *line = owl_editwin_get_text(e);
-
-  rv = owl_function_command(line);
-   if (rv) {
-    owl_function_makemsg("%s", rv);
-    owl_free(rv);
-  }
-}
-
 void owl_function_start_command(const char *line)
 {
   owl_editwin *tw;
 
-  tw = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
+  tw=owl_global_get_typwin(&g);
+  owl_global_set_typwin_active(&g);
+  owl_editwin_new_style(tw, OWL_EDITWIN_STYLE_ONELINE, 
+                        owl_global_get_cmd_history(&g));
 
   owl_editwin_set_locktext(tw, "command: ");
@@ -1936 +1933 @@
 
   owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline");
-  owl_editwin_set_callback(tw, owl_callback_command);
-}
-
-owl_editwin *owl_function_start_question(const char *line)
+}
+
+void owl_function_start_question(const char *line)
 {
   owl_editwin *tw;
 
-  tw = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
+  tw=owl_global_get_typwin(&g);
+  owl_global_set_typwin_active(&g);
+  owl_editwin_new_style(tw, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
 
   owl_editwin_set_locktext(tw, line);
@@ -1950 +1948 @@
   owl_editwin_redisplay(tw);
 
-  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse");
-  return tw;
-}
-
-owl_editwin *owl_function_start_password(const char *line)
+  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editline");
+}
+
+void owl_function_start_password(const char *line)
 {
   owl_editwin *tw;
 
-  tw = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, NULL);
-
+  tw=owl_global_get_typwin(&g);
+  owl_global_set_typwin_active(&g);
+  owl_editwin_new_style(tw, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
   owl_editwin_set_echochar(tw, '*');
 
@@ -1968 +1966 @@
 
   owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse");
-  return tw;
 }
 
@@ -2292 +2289 @@
  * instance is NULL then catch all messgaes in the class.  Returns the
  * name of the filter, which the caller must free.
- * If 'related' is nonzero, encompass unclasses and .d classes as well.
  */
-char *owl_function_classinstfilt(const char *c, const char *i, int related) 
+char *owl_function_classinstfilt(const char *c, const char *i) 
 {
   owl_filter *f;
@@ -2301 +2297 @@
   char *class, *instance = NULL;
 
-  if (related) {
-    class = owl_util_baseclass(c);
-    if (i) {
-      instance = owl_util_baseclass(i);
-    }
-  } else {
-    class = owl_strdup(c);
-    if (i) {
-      instance = owl_strdup(i);
-    }
+  class = owl_util_baseclass(c);
+  if(i) {
+    instance = owl_util_baseclass(i);
   }
 
   /* name for the filter */
   if (!instance) {
-    filtname = owl_sprintf("%sclass-%s", related ? "related-" : "", class);
-  } else {
-    filtname = owl_sprintf("%sclass-%s-instance-%s", related ? "related-" : "", class, instance);
+    filtname = owl_sprintf("class-%s", class);
+  } else {
+    filtname = owl_sprintf("class-%s-instance-%s", class, instance);
   }
   /* downcase it */
@@ -2349 +2338 @@
   }
 
-  argbuff = owl_sprintf(related ? "class ^(un)*%s(\\.d)*$" : "class ^%s$", tmpclass);
+  argbuff = owl_sprintf("class ^(un)*%s(\\.d)*$", tmpclass);
   if (tmpinstance) {
     char *tmp = argbuff;
-    argbuff = owl_sprintf(related ? "%s and ( instance ^(un)*%s(\\.d)*$ )" : "%s and instance ^%s$", tmp, tmpinstance);
+    argbuff = owl_sprintf("%s and ( instance ^(un)*%s(\\.d)*$ )", tmp, tmpinstance);
     owl_free(tmp);
   }
@@ -2523 +2512 @@
  *    name to the AIM conversation with that user 
  */
-char *owl_function_smartfilter(int type, int invert_related)
+char *owl_function_smartfilter(int type)
 {
   const owl_view *v;
   const owl_message *m;
   char *zperson, *filtname=NULL;
-  const char *argv[2];
-  int related = owl_global_is_narrow_related(&g) ^ invert_related;
-
+  const char *argv[1];
+  
   v=owl_global_get_current_view(&g);
   m=owl_view_get_element(v, owl_global_get_curmsg(&g));
@@ -2574 +2562 @@
     /* narrow class MESSAGE, instance foo, recip * messages to class, inst */
     if (!strcasecmp(owl_message_get_class(m), "message")) {
-      filtname=owl_function_classinstfilt(owl_message_get_class(m), owl_message_get_instance(m), related);
+      filtname=owl_function_classinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
       return(filtname);
     }
@@ -2580 +2568 @@
     /* otherwise narrow to the class */
     if (type==0) {
-      filtname=owl_function_classinstfilt(owl_message_get_class(m), NULL, related);
+      filtname=owl_function_classinstfilt(owl_message_get_class(m), NULL);
     } else if (type==1) {
-      filtname=owl_function_classinstfilt(owl_message_get_class(m), owl_message_get_instance(m), related);
+      filtname=owl_function_classinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
     }
     return(filtname);
@@ -2588 +2576 @@
 
   /* pass it off to perl */
-  argv[0] = type ? "1" : "0";
-  argv[1] = related ? "1" : "0";
-  return owl_perlconfig_message_call_method(m, "smartfilter", 2, argv);
+  if(type) {
+    argv[0] = "-i";
+  };
+  return owl_perlconfig_message_call_method(m, "smartfilter", type ? 1 : 0, argv);
 }
 
@@ -3429 +3418 @@
   int i, j;
   owl_list anyone;
+  owl_message *m;
   owl_zbuddylist *zbl;
-  GList **zaldlist;
-  GList *zaldptr;
-  ZAsyncLocateData_t *zald;
   const char *user;
+  ZLocations_t location[200];
+  int numlocs, ret;
 
   if (!owl_global_is_havezephyr(&g)) return;
-  owl_global_set_pseudologin_notify(&g, notify);
-  zbl = owl_global_get_zephyr_buddylist(&g);
-  zaldlist = owl_global_get_zaldlist(&g);
-
-  /* Clear the existing ZALDs first. */
-  zaldptr = g_list_first(*zaldlist);
-  while (zaldptr) {
-    ZFreeALD(zaldptr->data);
-    owl_free(zaldptr->data);
-    zaldptr = g_list_next(zaldptr);
-  }
-  g_list_free(*zaldlist);
-  *zaldlist = NULL;
+
+  zbl=owl_global_get_zephyr_buddylist(&g);
 
   owl_list_create(&anyone);
-  owl_zephyr_get_anyone_list(&anyone, NULL);
-  j = owl_list_get_size(&anyone);
-  for (i = 0; i < j; i++) {
-    user = owl_list_get_element(&anyone, i);
-    zald = owl_malloc(sizeof(ZAsyncLocateData_t));
-    if (ZRequestLocations(zstr(user), zald, UNACKED, ZAUTH) == ZERR_NONE) {
-      *zaldlist = g_list_append(*zaldlist, zald);
-    } else {
-      owl_free(zald);
+  ret=owl_zephyr_get_anyone_list(&anyone, NULL);
+
+  j=owl_list_get_size(&anyone);
+  for (i=0; i<j; i++) {
+    user=owl_list_get_element(&anyone, i);
+    ret=ZLocateUser(zstr(user), &numlocs, ZAUTH);
+    if (ret!=ZERR_NONE) {
+      owl_function_error("Error getting location for %s", user);
+      continue;
+    }
+    numlocs=200;
+    ret=ZGetLocations(location, &numlocs);
+    if (ret==0) {
+      if ((numlocs>0) && !owl_zbuddylist_contains_user(zbl, user)) {
+        /* Send a PSEUDO LOGIN! */
+        if (notify) {
+          m=owl_malloc(sizeof(owl_message));
+          owl_message_create_pseudo_zlogin(m, 0, user, location[0].host, location[0].time, location[0].tty);
+          owl_global_messagequeue_addmsg(&g, m);
+        }
+        owl_zbuddylist_adduser(zbl, user);
+        owl_function_debugmsg("owl_function_zephyr_buddy_check: login for %s ", user);
+      } else if ((numlocs==0) && owl_zbuddylist_contains_user(zbl, user)) {
+        /* I don't think this ever happens (if there are 0 locations we should get an error from
+         * ZGetLocations)
+         */
+        owl_function_error("owl_function_zephyr_buddy_check: exceptional case logout for %s ",user);
+      }
+    } else if ((ret==ZERR_NOLOCATIONS) && owl_zbuddylist_contains_user(zbl, user)) {
+      /* Send a PSEUDO LOGOUT! */
+      if (notify) {
+        m=owl_malloc(sizeof(owl_message));
+        owl_message_create_pseudo_zlogin(m, 1, user, "", "", "");
+        owl_global_messagequeue_addmsg(&g, m);
+      }
+      owl_zbuddylist_deluser(zbl, user);
+      owl_function_debugmsg("owl_function_zephyr_buddy_check: logout for %s ",user);
     }
   }

global.c

@@ -45 +45 @@
   g->rightshift=0;
 
-  g->tw = NULL;
+  g->tw = owl_editwin_allocate();
+  owl_editwin_init(g->tw, NULL, owl_global_get_typwin_lines(g), g->cols, OWL_EDITWIN_STYLE_ONELINE, NULL);
 
   owl_keyhandler_init(&g->kh);
@@ -57 +58 @@
   g->curmsg_vert_offset=0;
   g->resizepending=0;
+  g->typwinactive=0;
   g->direction=OWL_DIRECTION_DOWNWARDS;
   g->zaway=0;
@@ -109 +111 @@
   owl_zbuddylist_create(&(g->zbuddies));
 
-  g->zaldlist = NULL;
-  g->pseudologin_notify = 0;
-
   owl_obarray_init(&(g->obarray));
 
@@ -172 +171 @@
   _owl_panel_set_window(&g->typpan, newwin(typwin_lines, cols, g->recwinlines+2, 0));
 
-  if (g->tw)
-      owl_editwin_set_curswin(g->tw, owl_global_get_curs_typwin(g), typwin_lines, g->cols);
+  owl_editwin_set_curswin(g->tw, owl_global_get_curs_typwin(g), typwin_lines, g->cols);
 
   idlok(owl_global_get_curs_typwin(g), FALSE);
@@ -326 +324 @@
 }
 
+/* buffercommand */
+
+void owl_global_set_buffercommand(owl_global *g, const char *command) {
+  owl_editwin_set_command(owl_global_get_typwin(g), command);
+}
+
+const char *owl_global_get_buffercommand(const owl_global *g) {
+  return owl_editwin_get_command(owl_global_get_typwin(g));
+}
+
+void owl_global_set_buffercallback(owl_global *g, void (*cb)(owl_editwin*)) {
+  owl_editwin_set_callback(owl_global_get_typwin(g), cb);
+}
+
+void (*owl_global_get_buffercallback(const owl_global *g))(owl_editwin*) {
+  return owl_editwin_get_callback(owl_global_get_typwin(g));
+}
+
 /* refresh */
 
@@ -365 +381 @@
 /* typwin */
 
-owl_editwin *owl_global_set_typwin_active(owl_global *g, int style, owl_history *hist) {
-  int d;
-  d = owl_global_get_typewindelta(g);
-  if (d > 0 && style == OWL_EDITWIN_STYLE_MULTILINE)
+int owl_global_is_typwin_active(const owl_global *g) {
+  if (g->typwinactive==1) return(1);
+  return(0);
+}
+
+void owl_global_set_typwin_active(owl_global *g) {
+  int d = owl_global_get_typewindelta(g);
+  if (d > 0)
       owl_function_resize_typwin(owl_global_get_typwin_lines(g) + d);
 
-  g->tw = owl_editwin_new(owl_global_get_curs_typwin(g),
-                          owl_global_get_typwin_lines(g),
-                          g->cols,
-                          style,
-                          hist);
-  return g->tw;
+  g->typwinactive=1;
 }
 
 void owl_global_set_typwin_inactive(owl_global *g) {
   int d = owl_global_get_typewindelta(g);
-  if (d > 0 && owl_editwin_get_style(g->tw) == OWL_EDITWIN_STYLE_MULTILINE)
+  if (d > 0)
       owl_function_resize_typwin(owl_global_get_typwin_lines(g) - d);
 
-  werase(owl_global_get_curs_typwin(g));
-  g->tw = NULL;
+  g->typwinactive=0;
 }
 
@@ -517 +531 @@
   owl_mainwin_redisplay(&(g->mw));
   sepbar(NULL);
-  if (g->tw)
-      owl_editwin_redisplay(g->tw);
-  else
-    werase(owl_global_get_curs_typwin(g));
-
+  owl_editwin_redisplay(g->tw);
   owl_function_full_redisplay();
 
@@ -958 +968 @@
 }
 
-GList **owl_global_get_zaldlist(owl_global *g)
-{
-  return &(g->zaldlist);
-}
-
-int owl_global_get_pseudologin_notify(owl_global *g)
-{
-  return g->pseudologin_notify;
-}
-
-void owl_global_set_pseudologin_notify(owl_global *g, int notify)
-{
-  g->pseudologin_notify = notify;
-}
-
 struct termios *owl_global_get_startup_tio(owl_global *g)
 {

keybinding.c

@@ -14 +14 @@
 int owl_keybinding_init(owl_keybinding *kb, const char *keyseq, const char *command, void (*function_fn)(void), const char *desc)
 {
+  char **ktokens;
+  int    nktokens, i;
+  
   owl_function_debugmsg("owl_keybinding_init: creating binding for <%s> with desc: <%s>", keyseq, desc);
   if (command && !function_fn) {
@@ -22 +25 @@
     return(-1);
   }
-
-  if (owl_keybinding_make_keys(kb, keyseq) != 0) {
-    return(-1);
-  }
-
-  if (command) kb->command = owl_strdup(command);
-  kb->function_fn = function_fn;
-  if (desc) kb->desc = owl_strdup(desc);
-  else kb->desc = NULL;
-  return(0);
-}
-
-int owl_keybinding_make_keys(owl_keybinding *kb, const char *keyseq)
-{
-  char **ktokens;
-  int    nktokens, i;
 
   ktokens = atokenize(keyseq, " ", &nktokens);
@@ -55 +42 @@
   }
   kb->len = nktokens;
+
   atokenize_delete(ktokens, nktokens);
+
+  if (command) kb->command = owl_strdup(command);
+  kb->function_fn = function_fn;
+  if (desc) kb->desc = owl_strdup(desc);
+  else kb->desc = NULL;
   return(0);
 }

keymap.c

@@ -51 +51 @@
   }
   return owl_list_append_element(&km->bindings, kb);  
-
-}
-
-/* removes the binding associated with the keymap */
-int owl_keymap_remove_binding(owl_keymap *km, const char *keyseq)
-{
-  owl_keybinding *kb, *curkb;
-  int i;
-
-  if ((kb = owl_malloc(sizeof(owl_keybinding))) == NULL) return(-1);
-  if (0 != owl_keybinding_make_keys(kb, keyseq)) {
-    owl_free(kb);
-    return(-1);
-  }
-
-  for (i = owl_list_get_size(&km->bindings)-1; i >= 0; i--) {
-    curkb = owl_list_get_element(&km->bindings, i);
-    if (owl_keybinding_equal(curkb, kb)) {
-      owl_list_remove_element(&km->bindings, i);
-      owl_keybinding_delete(curkb);
-      return(0);
-    }
-  }
-  return(-2);
-}
-
+}
 
 /* returns a summary line describing this keymap.  the caller must free. */

keys.c

@@ -246 +246 @@
   BIND_CMD("M-n", "smartnarrow",      "narrow to a view based on the current message");
   BIND_CMD("M-N", "smartnarrow -i",   "narrow to a view based on the current message, and consider instance pair");
-  BIND_CMD("M-m", "smartnarrow -r",   "like M-n but with 'narrow-related' temporarily flipped.");
-  BIND_CMD("M-M", "smartnarrow -ri",  "like M-N but with 'narrow-related' temporarily flipped.");
   BIND_CMD("M-p", "view personal", "");
   

owl.c

@@ -629 +629 @@
       /* leave the cursor in the appropriate window */
       if (!owl_popwin_is_active(owl_global_get_popwin(&g))
-          && owl_global_get_typwin(&g)) {
+          && owl_global_is_typwin_active(&g)) {
         owl_function_set_cursor(typwin);
       } else {

owl.h

@@ -559 +559 @@
   int resizepending;
   int recwinlines;
+  int typwinactive;
   char *thishost;
   char *homedir;
@@ -603 +604 @@
   owl_zbuddylist zbuddies;
   owl_timer zephyr_buddycheck_timer;
-  GList *zaldlist;
-  int pseudologin_notify;
   struct termios startup_tio;
   owl_obarray obarray;

perl/lib/BarnOwl/Style/Default.pm

@@ -168 +168 @@
     ? '@color(cyan)' : '';
 
-  my $chars = $oneline ? qr/[[:cntrl:]]/ : qr/[^[:print:]\n]|[\r\cK\f]/;
+  my $chars = $oneline ? qr/[[:cntrl:]]/ : qr/[^[:print:]]|[\r\cK\f]/;
 
   $s =~ s/($chars)/
@@ -179 +179 @@
 
 As above, but always be conservative, and replace with a '?' instead
-of something more elaborate.
+of something mmore elaborate.
 
 =cut

perlconfig.c

@@ -574 +574 @@
   FREETMPS;
   LEAVE;
-}
-
-void owl_perlconfig_dec_refcnt(void *data)
-{
-  SV *v = data;
-  SvREFCNT_dec(v);
+
+  SvREFCNT_dec(cb);
+  owl_editwin_set_cbdata(e, NULL);
 }
 

perlglue.xs

@@ -172 +172 @@
         SV *callback
         PREINIT:
-                owl_editwin *e;
         CODE:
         {
@@ -178 +177 @@
                         croak("Callback must be a subref");
 
-                e = owl_function_start_question(line);
-
-                owl_editwin_set_cbdata(e,
-                                       newSVsv(callback),
-                                       owl_perlconfig_dec_refcnt);
-                owl_editwin_set_callback(e, owl_perlconfig_edit_callback);
+                owl_function_start_question(line);
+
+                owl_editwin_set_cbdata(owl_global_get_typwin(&g), newSVsv(callback));
+                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback);
         }
 
@@ -191 +188 @@
         SV *callback
         PREINIT:
-                owl_editwin *e;
         CODE:
         {
@@ -197 +193 @@
                         croak("Callback must be a subref");
 
-                e = owl_function_start_password(line);
-
-                owl_editwin_set_cbdata(e,
-                                       newSVsv(callback),
-                                       owl_perlconfig_dec_refcnt);
-                owl_editwin_set_callback(e, owl_perlconfig_edit_callback);
+                owl_function_start_password(line);
+
+                owl_editwin_set_cbdata(owl_global_get_typwin(&g), newSVsv(callback));
+                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback);
         }
 
@@ -214 +208 @@
                         croak("Callback must be a subref");
 
-                owl_function_start_edit_win(line,
-                                            owl_perlconfig_edit_callback,
-                                            newSVsv(callback),
-                                            owl_perlconfig_dec_refcnt);
+                owl_function_start_edit_win(line, owl_perlconfig_edit_callback, newSVsv(callback));
         }
 
@@ -551 +542 @@
         int count;
         const char *string;
-        PREINIT:
-                owl_editwin *e;
-        CODE:
-                e = owl_global_get_typwin(&g);
-                if (e) {
-                        RETVAL = owl_editwin_replace(e, count, string);
-                } else {
-                        RETVAL = 0;
-                }
+        CODE:
+                RETVAL = owl_editwin_replace(owl_global_get_typwin(&g), count, string);
         OUTPUT:
                 RETVAL
@@ -566 +550 @@
 point_move(delta)
         int delta;
-        PREINIT:
-                owl_editwin *e;
-        CODE:
-                e = owl_global_get_typwin(&g);
-                if (e) {
-                        RETVAL = owl_editwin_point_move(e, delta);
-                } else {
-                        RETVAL = 0;
-                }
+        CODE:
+                RETVAL = owl_editwin_point_move(owl_global_get_typwin(&g), delta);
         OUTPUT:
                 RETVAL
@@ -581 +558 @@
 replace_region(string)
         const char *string;
-        PREINIT:
-                owl_editwin *e;
-        CODE:
-                e = owl_global_get_typwin(&g);
-                if (e) {
-                        RETVAL = owl_editwin_replace_region(e, string);
-                } else {
-                        RETVAL = 0;
-                }
+        CODE:
+                RETVAL = owl_editwin_replace_region(owl_global_get_typwin(&g), string);
         OUTPUT:
                 RETVAL
@@ -597 +567 @@
         PREINIT:
                 char *region;
-                owl_editwin *e;
-        CODE:
-                e = owl_global_get_typwin(&g);
-                if (e) {
-                        region = owl_editwin_get_region(owl_global_get_typwin(&g));
-                } else {
-                        region = NULL;
-                }
+        CODE:
+                region = owl_editwin_get_region(owl_global_get_typwin(&g));
                 RETVAL = region;
         OUTPUT:
@@ -617 +581 @@
         PREINIT:
                 int count;
-                owl_editwin *e;
                 owl_editwin_excursion *x;
         CODE:
         {
-                e = owl_global_get_typwin(&g);
-                if(!e)
-                        croak("The edit window is not currently active!");
-
                 x = owl_editwin_begin_excursion(owl_global_get_typwin(&g));
                 PUSHMARK(SP);
@@ -646 +605 @@
 int
 current_column()
-        PREINIT:
-                owl_editwin *e;
-        CODE:
-                e = owl_global_get_typwin(&g);
-                if (e) {
-                        RETVAL = owl_editwin_current_column(e);
-                } else {
-                        RETVAL = 0;
-                }
+        CODE:
+                RETVAL = owl_editwin_current_column(owl_global_get_typwin(&g));
         OUTPUT:
                 RETVAL
@@ -660 +612 @@
 int
 point()
-        PREINIT:
-                owl_editwin *e;
-        CODE:
-                e = owl_global_get_typwin(&g);
-                if (e) {
-                        RETVAL = owl_editwin_get_point(e);
-                } else {
-                        RETVAL = 0;
-                }
+        CODE:
+                RETVAL = owl_editwin_get_point(owl_global_get_typwin(&g));
         OUTPUT:
                 RETVAL
@@ -674 +619 @@
 int
 mark()
-        PREINIT:
-                owl_editwin *e;
-        CODE:
-                e = owl_global_get_typwin(&g);
-                if (e) {
-                        RETVAL = owl_editwin_get_mark(e);
-                } else {
-                        RETVAL = 0;
-                }
-        OUTPUT:
-                RETVAL
+        CODE:
+                RETVAL = owl_editwin_get_mark(owl_global_get_typwin(&g));
+        OUTPUT:
+                RETVAL

popexec.c

@@ -96 +96 @@
   if (!pe->pid && !pe->winactive) {
     owl_select_remove_io_dispatch(d);
-    pe->dispatch = NULL;
     return;
   }
@@ -115 +114 @@
     }
     owl_select_remove_io_dispatch(d);
-    pe->dispatch = NULL;
     return;
   }
@@ -159 +157 @@
 
   pe->winactive = 0;
-  if (pe->dispatch) {
+  if (pe->dispatch->fd > 0) {
     owl_select_remove_io_dispatch(pe->dispatch);
-    pe->dispatch = NULL;
   }
   if (pe->pid) {

scripts/add-changelog

@@ -1 +1 @@
 #!/bin/sh
 version=$1; shift
-
-if [ -z "$version" ] || [ "$#" = 0 ];  then
-    echo "Usage: $0 VERSION REV-LIST-ARGS" > &2
-    exit 1;
-fi
 
 (

scripts/do-release

@@ -4 +4 @@
     echo "$@" >&2
     exit 1
-}
-
-usage() {
-    cat >&2 <<EOF
-Usage: %0 [options]
-Generate a barnowl release tarball.
-
-OPTIONS:
-  -f            Don't require a changelog entry for the new release.
-  --no-tag      Don't create and sign a git tag for the new release
-  --git         Do a beta release for the current git revision.
-EOF
 }
 
@@ -27 +15 @@
         --no-tag) no_tag=1 ;;
         --git) git=1 ;;
-        -h|--help) usage ;;
     esac
 done

scripts/locker-build

@@ -3 +3 @@
 #########################################################
 # Build script to build BarnOwl for the locker.
+
+# Usage: locker-build [-n] [-o OUTPUT-TGZ] SOURCE-TARBALL
+# -n is a dry-run, and drops to a shell in the build directory
+# -o does the install into a temporary directory and tars it into the
+#    specified tarball instead.
+# SOURCE-TARBALL is a source tarball, created by do-release
+
 die() {
     echo "$@" 2>&1;
@@ -15 +22 @@
 
 usage () {
-    cat >&2 <<EOF
-Usage: $0 [-n] [-o OUTPUT-TGZ] SOURCE-TARBALL
- -n is a dry-run, and drops to a shell in the build directory
- -o does the install into a temporary directory and tars it into the
-    specified tarball instead.
-
-SOURCE-TARBALL is a source tarball, created by do-release.
-EOF
+    echo "Usage: $0 [-n] [-o OUTPUT-TGZ] SOURCE-TARBALL"
     exit 2;
 }

variable.c

@@ -358 +358 @@
                "normal,top,neartop,center,paged,pagedcenter" ),
 
-  OWLVAR_BOOL( "narrow-related" /* %OwlVarStub:narrow_related */, 1,
-               "Make smartnarrow use broader filters",
-               "Causes smartfiler to narrow to messages \"related\" to \n"
-               "the current message, as well as ones to the same place.\n\n"
-               "for Zephyr, this controls whether to narrow to e.g. class-help or\n"
-               "class-help.d alone, or to related-class-help, which includes\n"
-               "help, unhelp, help.d, etc.\n\nDefault is true (include unclasses, etc.).\n" ),
 
   OWLVAR_BOOL( "_followlast" /* %OwlVarStub */, 0,

zephyr.c

@@ -1299 +1299 @@
 }
 
-#ifdef HAVE_LIBZEPHYR
-void owl_zephyr_process_pseudologin(ZNotice_t *n)
-{
-  owl_message *m;
-  owl_zbuddylist *zbl;
-  GList **zaldlist;
-  GList *zaldptr;
-  ZAsyncLocateData_t *zald = NULL;
-  ZLocations_t location;
-  int numlocs, ret, notify;
-
-  /* Find a ZALD to match this notice. */
-  zaldlist = owl_global_get_zaldlist(&g);
-  zaldptr = g_list_first(*zaldlist);
-  while (zaldptr) {
-    if (ZCompareALDPred(n, zaldptr->data)) {
-      zald = zaldptr->data;
-      *zaldlist = g_list_remove(*zaldlist, zaldptr->data);
-      break;
-    }
-    zaldptr = g_list_next(zaldptr);
-  }
-  if (zald) {
-    /* Deal with notice. */
-    notify = owl_global_get_pseudologin_notify(&g);
-    zbl = owl_global_get_zephyr_buddylist(&g);
-    ret = ZParseLocations(n, zald, &numlocs, NULL);
-    if (ret == ZERR_NONE) {
-      if (numlocs > 0 && !owl_zbuddylist_contains_user(zbl, zald->user)) {
-        if (notify) {
-          numlocs = 1;
-          ret = ZGetLocations(&location, &numlocs);
-          if (ret == ZERR_NONE) {
-            /* Send a PSEUDO LOGIN! */
-            m = owl_malloc(sizeof(owl_message));
-            owl_message_create_pseudo_zlogin(m, 0, zald->user,
-                                             location.host,
-                                             location.time,
-                                             location.tty);
-            owl_global_messagequeue_addmsg(&g, m);
-          }
-          owl_zbuddylist_adduser(zbl, zald->user);
-          owl_function_debugmsg("owl_function_zephyr_buddy_check: login for %s ", zald->user);
-        }
-      } else if (numlocs == 0 && owl_zbuddylist_contains_user(zbl, zald->user)) {
-        /* Send a PSEUDO LOGOUT! */
-        if (notify) {
-          m = owl_malloc(sizeof(owl_message));
-          owl_message_create_pseudo_zlogin(m, 1, zald->user, "", "", "");
-          owl_global_messagequeue_addmsg(&g, m);
-        }
-        owl_zbuddylist_deluser(zbl, zald->user);
-        owl_function_debugmsg("owl_function_zephyr_buddy_check: logout for %s ", zald->user);
-      }
-    }
-    ZFreeALD(zald);
-    owl_free(zald);
-  }
-}
-#else
-void owl_zephyr_process_pseudologin(void *n)
-{
-}
-#endif
-
 /*
  * Process zephyrgrams from libzephyr's queue. To prevent starvation,
@@ -1398 +1333 @@
       }
 
-      /* if it is a LOCATE message, it's for pseudologins. */
-      if (strcmp(notice.z_opcode, LOCATE_LOCATE) == 0) {
-        owl_zephyr_process_pseudologin(&notice);
-        ZFreeNotice(&notice);
-        continue;
-      }
-
       /* create the new message */
       m=owl_malloc(sizeof(owl_message));