--- rxvt-unicode/src/main.C	2007/08/17 22:02:14	1.245
+++ rxvt-unicode/src/main.C	2007/08/28 16:56:40	1.247
@@ -542,14 +542,10 @@
         else
           bgPixmap.set_defaultGeometry ();
 
-        bgPixmap.set_file (rs[Rs_backgroundPixmap]);
+        if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
+          if (!option (Opt_transparent))
+            update_background ();
       }
-    /* do not want to render Pixmap yet if we are size/position dependant - 
-     * wait for ConfigureNotify at least 
-     * TODO: this does not work for some reason when transparency is disabled !!!!
-     */
-    if (!bgPixmap.window_size_sensitive ())
-      update_background ();
 #endif
   }
 #endif
@@ -1150,8 +1146,7 @@
                          window_vt_x, window_vt_y,
                          width, height);
 
-#ifdef XPM_BACKGROUND
-                /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
+#ifdef HAVE_BG_PIXMAP
       if (bgPixmap.window_size_sensitive ())
           update_background ();
 #endif