--- rxvt-unicode/src/main.C	2007/09/12 20:29:24	1.249
+++ rxvt-unicode/src/main.C	2007/10/08 07:05:23	1.252
@@ -529,7 +529,7 @@
       }
 #endif
 
-#ifdef XPM_BACKGROUND
+#ifdef BG_IMAGE_FROM_FILE
     if (rs[Rs_backgroundPixmap] != NULL)
       {
         const char *p = rs[Rs_backgroundPixmap];
@@ -944,10 +944,10 @@
 #endif
 }
 
-#ifdef XTERM_COLOR_CHANGE
 void
 rxvt_term::set_window_color (int idx, const char *color)
 {
+#ifdef XTERM_COLOR_CHANGE
   rxvt_color xcol;
   int i;
   
@@ -994,11 +994,8 @@
   update_fade_color (idx);
   recolour_cursor ();
   scr_recolour ();
-}
-
-#else
-# define set_window_color (idx,color)   ((void)0)
 #endif                          /* XTERM_COLOR_CHANGE */
+}
 
 void
 rxvt_term::recolour_cursor ()
@@ -1040,7 +1037,7 @@
     if (pix_colors[Color_bg] == pix_colors[i])
       {
         sprintf (bstr, "%d", (i - Color_Black));
-#ifdef XPM_BACKGROUND
+#ifdef BG_IMAGE_FROM_FILE
         xpmb = "default;";
 #endif
         break;
@@ -1735,11 +1732,11 @@
 int
 rxvt_term::update_background ()
 {
-  bgPixmap.invalidate();
+  bgPixmap.invalidate ();
 
   /* no chance of real time refresh if we are blurring ! */
   if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
-    bgPixmap.render();
+    bgPixmap.render ();
   else
     {
       update_background_ev.stop ();