From 5fa1855a832d2a78376048837d5ae88e391b8a23 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Tue, 20 Jan 2009 23:31:51 +0100
Subject: [PATCH] Make _gdk_x11_window_tmp_unset_parent_bg not change above the
 toplevel window

---
 gdk/x11/gdkwindow-x11.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index be7947df16..39dbda5079 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -314,8 +314,11 @@ _gdk_x11_window_tmp_unset_parent_bg (GdkWindow *window,
 {
   GdkWindowObject *private;
   private = (GdkWindowObject*) window;
-  _gdk_x11_window_tmp_unset_bg (_gdk_window_get_impl_window ((GdkWindow *)private->parent),
-				recurse);
+  
+  if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
+    window = _gdk_window_get_impl_window ((GdkWindow *)private->parent);
+  
+  _gdk_x11_window_tmp_unset_bg (window,	recurse);
 }
 
 void
@@ -355,8 +358,11 @@ _gdk_x11_window_tmp_reset_parent_bg (GdkWindow *window,
 {
   GdkWindowObject *private;
   private = (GdkWindowObject*) window;
-  _gdk_x11_window_tmp_reset_bg (_gdk_window_get_impl_window ((GdkWindow *)private->parent),
-				recurse);
+
+  if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT)
+    window = _gdk_window_get_impl_window ((GdkWindow *)private->parent);
+
+  _gdk_x11_window_tmp_reset_bg (window, recurse);
 }
 
 static GdkColormap*