--- a/src/line_proto.c	Tue Mar 10 03:29:53 2009 +0200
+++ b/src/line_proto.c	Tue Mar 10 03:38:20 2009 +0200
@@ -32,7 +32,7 @@
     struct error_info err;
 
     /* Callback info */
-    line_proto_read_cb cb_read;
+    struct line_proto_callbacks callbacks;
     void *cb_arg;
 };
 
@@ -60,7 +60,7 @@
         
         // got a line?
         if (line)
-            lp->cb_read(line, lp->cb_arg);
+            lp->callbacks.on_line(line, lp->cb_arg);
 
     } while (line);
 
@@ -102,7 +102,7 @@
 };
 
 err_t line_proto_create (struct line_proto **lp_ptr, struct sock_stream *sock, size_t buf_size,
-        line_proto_read_cb cb_func, void *cb_arg, struct error_info *err)
+        const struct line_proto_callbacks *callbacks, void *cb_arg, struct error_info *err)
 {
     struct line_proto *lp;
 
@@ -117,7 +117,7 @@
     // store
     lp->sock = sock;
     lp->buf_len = buf_size;
-    lp->cb_read = cb_func;
+    lp->callbacks = *callbacks;
     lp->cb_arg = cb_arg;
 
     // initialize event-based stuff