--- rxvt-unicode/src/rxvtperl.xs	2007/10/31 09:55:24	1.115
+++ rxvt-unicode/src/rxvtperl.xs	2007/12/13 18:24:36	1.117
@@ -33,7 +33,7 @@
 
 #include "unistd.h"
 
-#include "iom.h"
+#include "ev_cpp.h"
 #include "rxvt.h"
 #include "keyboard.h"
 #include "rxvtutil.h"
@@ -777,7 +777,7 @@
 NV
 NOW ()
 	CODE:
-        RETVAL = NOW;
+        RETVAL = ev::now ();
         OUTPUT:
         RETVAL
 
@@ -859,19 +859,12 @@
 
         envv->push_back (0);
 
-        bool success;
-
         try
           {
-            success = term->init (argv, envv);
+            term->init (argv, envv);
           }
         catch (const class rxvt_failure_exception &e)
           {
-            success = false;
-          }
-
-        if (!success)
-          {
             term->destroy ();
             croak ("error while initializing new terminal instance");
           }
@@ -1141,10 +1134,10 @@
 }
 
 int
-rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
+rxvt_term::pty_ev_events (int events = ev::UNDEF)
 	CODE:
         RETVAL = THIS->pty_ev.events;
-        if (events != EVENT_UNDEF)
+        if (events != ev::UNDEF)
           THIS->pty_ev.set (events);
 	OUTPUT:
         RETVAL
@@ -1478,7 +1471,7 @@
           {
             THIS->set_option (optval, set);
 
-            if (THIS->check_ev.is_active ()) // avoid doing this before START
+            if (THIS->prepare_ev.is_active ()) // avoid doing this before START
               switch (optval)
                 {
                   case Opt_skipBuiltinGlyphs: