--- a/src/irc_conn.h	Thu Mar 12 18:08:27 2009 +0200
+++ b/src/irc_conn.h	Thu Mar 12 18:11:44 2009 +0200
@@ -55,14 +55,20 @@
     /** Opaque argument for callbacks */
     void *cb_arg;
 
+    /** @group flags @{ */
     /** Registration request sent */
     bool registering;
 
-    /* Registered (as in, we have a working nickname)? */
+    /** Registered (as in, we have a working nickname)? */
     bool registered;
+    
+    // @}
+    
+    /** Our current real nickname */
+    char *nickname;
 
-    /* Command handlers */
-    STAILQ_HEAD(irc_conn_handlers, irc_cmd_chain) handlers;
+    /** Command handlers */
+    irc_cmd_handlers_t handlers;
 };
 
 /**
@@ -98,7 +104,7 @@
  * @param chain the array of irc_cmd_handler structs, terminated with a NULL entry
  * @param arg the context argument to use for the callbacks
  */
-err_t irc_conn_register_handler_chain (struct irc_conn *conn, struct irc_cmd_handler *handlers, void *arg);
+err_t irc_conn_add_cmd_handlers (struct irc_conn *conn, struct irc_cmd_handler *handlers, void *arg);
 
 /**
  * Register with the IRC server using the given registration info (initial nickname etc.)