--- rxvt-unicode/src/init.C	2012/06/07 16:04:31	1.328
+++ rxvt-unicode/src/init.C	2014/05/22 18:54:32	1.332
@@ -16,7 +16,7 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -521,7 +521,7 @@
 #ifdef RXVT_SCROLLBAR
     COLOR_SCROLLTROUGH,
 #endif
-#if ENABLE_TRANSPARENCY
+#if BG_IMAGE_FROM_ROOT
     NULL,
 #endif
 #if OFF_FOCUS_FADING
@@ -807,30 +807,9 @@
 
   if (option (Opt_scrollBar))
     scrollBar.resize ();      /* create and map scrollbar */
-#ifdef HAVE_BG_PIXMAP
-  {
-    bg_init ();
-
-#if ENABLE_TRANSPARENCY
-    if (option (Opt_transparent))
-      {
-        bg_set_transparent ();
-
-        if (rs [Rs_blurradius])
-          root_effects.set_blur (rs [Rs_blurradius]);
-
-        if (ISSET_PIXCOLOR (Color_tint))
-          root_effects.set_tint (pix_colors_focused [Color_tint]);
 
-        if (rs [Rs_shade])
-          root_effects.set_shade (rs [Rs_shade]);
-
-        bg_set_root_pixmap ();
-        XSelectInput (dpy, display->root, PropertyChangeMask);
-        rootwin_ev.start (display, display->root);
-      }
-#endif
-  }
+#ifdef HAVE_BG_PIXMAP
+  bg_init ();
 #endif
 
 #if ENABLE_PERL
@@ -1431,9 +1410,7 @@
    */
 
   if (rs [Rs_iconfile])
-    {
-      set_icon (rs [Rs_iconfile]);
-    }
+    set_icon (rs [Rs_iconfile]);
 #endif
 
 #if ENABLE_FRILLS