X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FReadline.cc;h=188bc77394bdf2b2f0292f4d11d11762366c0897;hb=4e2b741f18b63e97ab4eef30fcee1dec999541be;hp=094c8e40c597cf4593c4e564aab193af082e283f;hpb=42f556b7d7c8f210c5919fcb298b0dccdae568e3;p=senf.git

diff --git a/Console/Readline.cc b/Console/Readline.cc
index 094c8e4..188bc77 100644
--- a/Console/Readline.cc
+++ b/Console/Readline.cc
@@ -116,10 +116,8 @@ namespace {
 
 prefix_ senf::console::detail::ReadlineClientReader::ReadlineClientReader(Client & client)
     : ClientReader(client), ch_ (-1), skipChars_ (0), 
-      schedBinding_ ( client.handle(), 
-                      senf::membind(&ReadlineClientReader::charEvent, this),
-                      Scheduler::EV_READ, 
-                      false ),
+      readevent_ ( "ReadlineClientReader", senf::membind(&ReadlineClientReader::charEvent, this),
+                   client.handle(), scheduler::FdEvent::EV_READ, false ),
       terminate_ (false)
 {
     if (instance_ != 0)
@@ -158,7 +156,7 @@ prefix_ senf::console::detail::ReadlineClientReader::ReadlineClientReader(Client
 
     _rl_bell_preference = 0; // Set this *after* the config file has been read
 
-    schedBinding_.enable();
+    readevent_.enable();
 }
 
 prefix_ senf::console::detail::ReadlineClientReader::~ReadlineClientReader()
@@ -198,10 +196,10 @@ prefix_ void senf::console::detail::ReadlineClientReader::v_translate(std::strin
     boost::replace_all(data, "\xff", "\xff\xff");
 }
 
-prefix_ void senf::console::detail::ReadlineClientReader::charEvent(Scheduler::EventId event)
+prefix_ void senf::console::detail::ReadlineClientReader::charEvent(int event)
 {
     char ch;
-    if (event != Scheduler::EV_READ || handle().read(&ch, &ch+1) <= &ch) {
+    if (event != scheduler::FdEvent::EV_READ || handle().read(&ch, &ch+1) <= &ch) {
         stopClient();
         return;
     }