Changes in owl.h [987cf3f:26ad412]

File:

• owl.h (modified) (8 diffs)

owl.h

@@ -74 +74 @@
 
 #define OWL_DEBUG 0
-#define OWL_DEBUG_FILE "/var/tmp/owldebug"
+#define OWL_DEBUG_FILE "/var/tmp/barnowl-debug"
 
 #define OWL_CONFIG_DIR "/.owl"             /* this is relative to the user's home directory */
@@ -344 +344 @@
 
 typedef struct _owl_zwrite {
-  char *cmd;
   char *zwriteline;
   char *class;
@@ -477 +476 @@
   char     *desc;               /* description */
   owl_list  bindings;           /* key bindings */
-  const struct _owl_keymap *parent;     /* parent */
+  const struct _owl_keymap *submap;     /* submap */
   void (*default_fn)(owl_input j);      /* default action (takes a keypress) */
   void (*prealways_fn)(owl_input  j);   /* always called before a keypress is received */
@@ -522 +521 @@
   short **pairs;
 } owl_colorpair_mgr;
+
+typedef struct _owl_obarray {
+  owl_list strings;
+} owl_obarray;
 
 typedef struct _owl_io_dispatch {
@@ -596 +599 @@
   owl_colorpair_mgr cpmgr;
   pid_t newmsgproc_pid;
+  int malloced, freed;
   owl_regex search_re;
   aim_session_t aimsess;
@@ -606 +610 @@
   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 */
+  owl_list messagequeue;    /* for queueing up aim and other messages */
   owl_dict styledict;       /* global dictionary of available styles */
   char *response;           /* response to the last question asked */
@@ -619 +623 @@
   int pseudologin_notify;
   struct termios startup_tio;
+  owl_obarray obarray;
   owl_list io_dispatch_list;
   owl_list psa_list;
@@ -625 +630 @@
   int load_initial_subs;
   volatile sig_atomic_t interrupted;
+  FILE *debug_file;
 } owl_global;