diff --git a/ChangeLog b/ChangeLog
index 3ad0bdd9a3..b61bf540ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 10 01:55:29 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gdk/x11/gdkwindow-x11.c (_gdk_x11_window_tmp_{re|un}set_bg):
+	Insert checks for root window. The root window is never mapped.
+
 Sat Jul 10 01:06:05 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gdk/x11/gdkwindow-x11.c (post_unmap): Fix a warning
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3ad0bdd9a3..b61bf540ce 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Jul 10 01:55:29 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gdk/x11/gdkwindow-x11.c (_gdk_x11_window_tmp_{re|un}set_bg):
+	Insert checks for root window. The root window is never mapped.
+
 Sat Jul 10 01:06:05 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gdk/x11/gdkwindow-x11.c (post_unmap): Fix a warning
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3ad0bdd9a3..b61bf540ce 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Jul 10 01:55:29 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gdk/x11/gdkwindow-x11.c (_gdk_x11_window_tmp_{re|un}set_bg):
+	Insert checks for root window. The root window is never mapped.
+
 Sat Jul 10 01:06:05 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gdk/x11/gdkwindow-x11.c (post_unmap): Fix a warning
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3ad0bdd9a3..b61bf540ce 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Jul 10 01:55:29 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gdk/x11/gdkwindow-x11.c (_gdk_x11_window_tmp_{re|un}set_bg):
+	Insert checks for root window. The root window is never mapped.
+
 Sat Jul 10 01:06:05 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gdk/x11/gdkwindow-x11.c (post_unmap): Fix a warning
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 9ff786dffa..d25c0980fb 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -277,8 +277,12 @@ _gdk_x11_window_tmp_unset_bg (GdkWindow *window,
   
   private = (GdkWindowObject *)window;
 
-  if (private->input_only || private->destroyed || !GDK_WINDOW_IS_MAPPED (window))
-    return;
+  if (private->input_only || private->destroyed ||
+      (private->window_type != GDK_WINDOW_ROOT &&
+       !GDK_WINDOW_IS_MAPPED (window)))
+    {
+      return;
+    }
 
   /* Don't unset the background of windows that don't select for expose
    * events. Such windows don't get drawn, so we need the X server
@@ -310,8 +314,12 @@ _gdk_x11_window_tmp_reset_bg (GdkWindow *window,
 
   private = (GdkWindowObject *)window;
 
-  if (private->input_only || private->destroyed || !GDK_WINDOW_IS_MAPPED (window))
-    return;
+  if (private->input_only || private->destroyed ||
+      (private->window_type != GDK_WINDOW_ROOT &&
+       !GDK_WINDOW_IS_MAPPED (window)))
+    {
+      return;
+    }
 
   if (private->window_type != GDK_WINDOW_ROOT &&
       private->window_type != GDK_WINDOW_FOREIGN &&