--- rxvt-unicode/src/init.C	2010/10/15 21:59:25	1.284
+++ rxvt-unicode/src/init.C	2011/01/27 17:37:19	1.292
@@ -145,7 +145,7 @@
 }
 #endif
 
-const char *const def_colorName[] =
+static const char *const def_colorName[] =
   {
     COLOR_FOREGROUND,
     COLOR_BACKGROUND,
@@ -636,7 +636,6 @@
 
 #ifdef HAVE_PIXBUF
   g_type_init ();
-  gdk_pixbuf_xlib_init_with_depth (dpy, display->screen, depth);
 #endif
 
 #if ENABLE_PERL
@@ -814,24 +813,23 @@
     scrollBar.resize ();      /* create and map scrollbar */
 #ifdef HAVE_BG_PIXMAP
   {
-    bgPixmap.set_target (this);
-    bgPixmap.invalidate ();
+    bg_init ();
 
 #ifdef ENABLE_TRANSPARENCY
     if (option (Opt_transparent))
       {
-        bgPixmap.set_transparent ();
+        bg_set_transparent ();
 
         if (rs [Rs_blurradius])
-          bgPixmap.set_blur_radius (rs [Rs_blurradius]);
+          bg_set_blur (rs [Rs_blurradius]);
 
         if (ISSET_PIXCOLOR (Color_tint))
-          bgPixmap.set_tint (pix_colors_focused [Color_tint]);
+          bg_set_tint (pix_colors_focused [Color_tint]);
 
         if (rs [Rs_shade])
-          bgPixmap.set_shade (rs [Rs_shade]);
+          bg_set_shade (rs [Rs_shade]);
 
-        bgPixmap.set_root_pixmap ();
+        bg_set_root_pixmap ();
         XSelectInput (dpy, display->root, PropertyChangeMask);
         rootwin_ev.start (display, display->root);
       }
@@ -845,13 +843,13 @@
         if ((p = strchr (p, ';')) != 0)
           {
             p++;
-            bgPixmap.set_geometry (p);
+            bg_set_geometry (p);
           }
         else
-          bgPixmap.set_defaultGeometry ();
+          bg_set_default_geometry ();
 
-        if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
-          if (!bgPixmap.window_position_sensitive ())
+        if (bg_set_file (rs[Rs_backgroundPixmap]))
+          if (!bg_window_position_sensitive ())
             update_background ();
       }
 #endif
@@ -893,7 +891,6 @@
 void
 rxvt_term::init_env ()
 {
-  int i;
   char *val;
 
 #ifdef DISPLAY_IS_IP
@@ -917,8 +914,7 @@
   if (rs[Rs_display_name] == NULL)
     rs[Rs_display_name] = val;   /* use broken `:0' value */
 
-  i = strlen (val);
-  env_display = (char *)rxvt_malloc (i + 9);
+  env_display = (char *)rxvt_malloc (strlen (val) + 9);
 
   sprintf (env_display, "DISPLAY=%s", val);
 
@@ -1510,7 +1506,7 @@
 #endif
   };
 
-  XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
+  XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
 
 #if ENABLE_FRILLS
   if (rs[Rs_transient_for])