[gtk+/client-side-windows: 100/284] Make _gdk_x11_window_tmp_unset_parent_bg not change above the toplevel window

[Alexander Larsson <alexl src gnome org>]

commit 5fa1855a832d2a78376048837d5ae88e391b8a23
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Jan 20 23:31:51 2009 +0100

    Make _gdk_x11_window_tmp_unset_parent_bg not change above the toplevel window
---
 gdk/x11/gdkwindow-x11.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index be7947d..39dbda5 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*