--- rxvt-unicode/src/main.C	2007/12/11 11:53:48	1.274
+++ rxvt-unicode/src/main.C	2007/12/14 02:22:24	1.282
@@ -13,7 +13,7 @@
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
  *                              - extensive modifications
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
 #include <csignal>
 #include <cstring>
 
-# include <termios.h>
+#include <termios.h>
 
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
@@ -157,10 +157,10 @@
   update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
 #endif
 #ifdef CURSOR_BLINK
-  cursor_blink_ev.set     <rxvt_term, &rxvt_term::cursor_blink_cb> (this);
+  cursor_blink_ev.set     <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
 #endif
 #ifdef TEXT_BLINK
-  text_blink_ev.set       <rxvt_term, &rxvt_term::text_blink_cb>   (this);
+  text_blink_ev.set       <rxvt_term, &rxvt_term::text_blink_cb>   (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
 #endif
 #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
   cont_scroll_ev.set      <rxvt_term, &rxvt_term::cont_scroll_cb>  (this);
@@ -329,7 +329,7 @@
 void
 rxvt_term::destroy ()
 {
-  if (ev_is_active (&destroy_ev))
+  if (destroy_ev.is_active ())
     return;
 
   HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
@@ -475,7 +475,7 @@
 }
 
 /*----------------------------------------------------------------------*/
-bool
+void
 rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
 {
   this->envv = envv;
@@ -484,8 +484,7 @@
   set_locale ("");
   set_environ (envv); // few things in X do not call setlocale :(
 
-  if (!init_vars ())
-    return false;
+  init_vars ();
 
   init_secondary ();
 
@@ -589,8 +588,6 @@
 
   XMapWindow (dpy, vt);
   XMapWindow (dpy, parent[0]);
-
-  return true;
 }
 
 static struct sig_handlers