--- rxvt-unicode/src/init.C	2008/01/27 16:52:13	1.245
+++ rxvt-unicode/src/init.C	2008/02/19 18:15:26	1.251
@@ -269,9 +269,7 @@
 #ifdef OPTION_HC
     NULL,
 #endif
-#ifdef HAVE_SCROLLBARS
     COLOR_SCROLLBAR,
-#endif
 #ifdef RXVT_SCROLLBAR
     COLOR_SCROLLTROUGH,
 #endif
@@ -489,9 +487,7 @@
 # endif
 #endif
 
-#ifdef HAVE_SCROLLBARS
-  setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
-#endif
+    scrollBar.setup (this);
 
 #ifdef XTERM_REVERSE_VIDEO
   /* this is how xterm implements reverseVideo */
@@ -557,10 +553,8 @@
   keyboard->register_done ();
 #endif
 
-#ifdef HAVE_SCROLLBARS
   if (option (Opt_scrollBar))
-    scrollBar.setIdle ();    /* set existence for size calculations */
-#endif
+    scrollBar.state = STATE_IDLE;    /* set existence for size calculations */
 
   pty = ptytty::create ();
 
@@ -574,10 +568,8 @@
   XSynchronize (dpy, True);
 #endif
 
-#ifdef HAVE_SCROLLBARS
   if (option (Opt_scrollBar))
-    resize_scrollbar ();      /* create and map scrollbar */
-#endif
+    scrollBar.resize ();      /* create and map scrollbar */
 #ifdef HAVE_BG_PIXMAP
   {
     bgPixmap.set_target (this);
@@ -842,7 +834,7 @@
 
 /*----------------------------------------------------------------------*/
 void
-rxvt_term::Get_Colours ()
+rxvt_term::get_colours ()
 {
   int i;
 
@@ -1069,7 +1061,7 @@
   dLocal (Display *, dpy);
 
   /* grab colors before netscape does */
-  Get_Colours ();
+  get_colours ();
 
   if (!set_fonts ())
     rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
@@ -1534,11 +1526,6 @@
   signal (SIGTTOU, SIG_IGN);
 #endif /* SIGTSTP */
 
-  // unblock signals (signals are blocked by iom.C
-  sigset_t ss;
-  sigemptyset (&ss);
-  sigprocmask (SIG_SETMASK, &ss, 0);
-
   /* command interpreter path */
   if (argv)
     {