--- rxvt-unicode/src/main.C	2008/01/27 22:48:33	1.303
+++ rxvt-unicode/src/main.C	2008/02/18 09:58:04	1.306
@@ -527,7 +527,7 @@
 rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
 {
   short recalc_x, recalc_y;
-  int x, y, sb_w, flags;
+  int x, y, flags;
   unsigned int w, h;
   unsigned int max_width, max_height;
 
@@ -594,12 +594,11 @@
 
   szHint.base_width = szHint.base_height = 2 * int_bwidth;
 
-  sb_w = 0;
   window_vt_x = window_vt_y = int_bwidth;
 
   if (scrollBar.state)
     {
-      sb_w = scrollbar_TotalWidth ();
+      int sb_w = scrollBar.total_width ();
       szHint.base_width += sb_w;
 
       if (!option (Opt_scrollBar_right))
@@ -633,9 +632,6 @@
       szHint.height = szHint.base_height + height;
     }
 
-  if (scrollBar.state && option (Opt_scrollBar_right))
-    window_sb_x = szHint.width - sb_w;
-
   if (recalc_x)
     szHint.x += DisplayWidth  (dpy, display->screen) - szHint.width  - 2 * ext_bwidth;
 
@@ -803,7 +799,6 @@
 {
 #ifdef XTERM_COLOR_CHANGE
   rxvt_color xcol;
-  int i;
 
   if (color == NULL || *color == '\0')
     return;
@@ -815,7 +810,7 @@
   /* handle color aliases */
   if (isdigit (*color))
     {
-      i = atoi (color);
+      int i = atoi (color);
 
       if (i >= 8 && i <= 15)
         {
@@ -985,12 +980,7 @@
   if (fix_screen || newwidth != old_width || newheight != old_height)
     {
       if (scrollBar.state)
-        {
-          XMoveResizeWindow (dpy, scrollBar.win,
-                             window_sb_x, 0,
-                             scrollbar_TotalWidth (), szHint.height);
-          resize_scrollbar ();
-        }
+        resize_scrollbar ();
 
       XMoveResizeWindow (dpy, vt,
                          window_vt_x, window_vt_y,