--- a/src/irc_queue.c	Tue Apr 28 17:52:48 2009 +0300
+++ b/src/irc_queue.c	Tue Apr 28 20:27:45 2009 +0300
@@ -1,9 +1,6 @@
 #include "irc_queue.h"
 #include "log.h"
 
-// XXX: for ev_base
-#include "sock_internal.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -128,7 +125,7 @@
     }
 }
 
-err_t irc_queue_create (struct irc_queue **queue_ptr, struct line_proto *lp, struct error_info *err)
+err_t irc_queue_create (struct irc_queue **queue_ptr, struct event_base *ev_base, struct line_proto *lp, struct error_info *err)
 {
     struct irc_queue *queue;
 
@@ -137,8 +134,7 @@
         return SET_ERROR(err, ERR_CALLOC);
 
     // create the timer event
-    // XXX: using the sock module ev_base
-    if ((queue->ev = evtimer_new(_sock_stream_ctx.ev_base, &irc_queue_timer, queue)) == NULL)
+    if ((queue->ev = evtimer_new(ev_base, &irc_queue_timer, queue)) == NULL)
         JUMP_SET_ERROR(err, ERR_EVENT_NEW);
 
     // initialize