Fix a warning Actually unset bg.

Sat Jul 10 01:06:05 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gdk/x11/gdkwindow-x11.c (post_unmap): Fix a warning
	* gdk/x11/gdkwindow-x11.c (show_window_internal): Actually unset
	bg.

diff --git a/ChangeLog b/ChangeLog
index 9e6286cb853623c2b8397a5ebd11b76c8bf747d5..3ad0bdd9a368b9451b59fb003cc40cd7fb3b884d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 10 01:06:05 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/x11/gdkwindow-x11.c (post_unmap): Fix a warning
+       * gdk/x11/gdkwindow-x11.c (show_window_internal): Actually unset
+       bg.
+
 Sat Jul 10 00:37:45 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Bug 113310.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9e6286cb853623c2b8397a5ebd11b76c8bf747d5..3ad0bdd9a368b9451b59fb003cc40cd7fb3b884d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Jul 10 01:06:05 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/x11/gdkwindow-x11.c (post_unmap): Fix a warning
+       * gdk/x11/gdkwindow-x11.c (show_window_internal): Actually unset
+       bg.
+
 Sat Jul 10 00:37:45 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Bug 113310.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9e6286cb853623c2b8397a5ebd11b76c8bf747d5..3ad0bdd9a368b9451b59fb003cc40cd7fb3b884d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Jul 10 01:06:05 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/x11/gdkwindow-x11.c (post_unmap): Fix a warning
+       * gdk/x11/gdkwindow-x11.c (show_window_internal): Actually unset
+       bg.
+
 Sat Jul 10 00:37:45 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Bug 113310.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9e6286cb853623c2b8397a5ebd11b76c8bf747d5..3ad0bdd9a368b9451b59fb003cc40cd7fb3b884d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Jul 10 01:06:05 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/x11/gdkwindow-x11.c (post_unmap): Fix a warning
+       * gdk/x11/gdkwindow-x11.c (show_window_internal): Actually unset
+       bg.
+
 Sat Jul 10 00:37:45 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Bug 113310.

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 0214177f415bca6d36229f35227abbd5a4388f37..9ff786dffa3c5d3c622e3724ebd733fcf0b445aa 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1340,12 +1340,17 @@ show_window_internal (GdkWindow *window,
 
       if (impl->position_info.mapped)
        {
+         gboolean unset_bg = !private->input_only &&
+           (private->window_type == GDK_WINDOW_CHILD ||
+            impl->override_redirect) &&
+           gdk_window_is_viewable (window);
+
+         if (unset_bg)
+           _gdk_x11_window_tmp_unset_bg (window, TRUE);
+         
          XMapWindow (xdisplay, xwindow);
 
-         if (!private->input_only &&
-             (private->window_type == GDK_WINDOW_CHILD ||
-              impl->override_redirect) &&
-             gdk_window_is_viewable (window))
+         if (unset_bg)
            {
              _gdk_x11_window_tmp_reset_bg (window, TRUE);
              gdk_window_invalidate_rect (window, NULL, TRUE);
@@ -1426,7 +1431,7 @@ post_unmap (GdkWindow *window)
     return;
 
   if (private->window_type == GDK_WINDOW_CHILD)
-    start_window = private->parent;
+    start_window = (GdkWindow *)private->parent;
   else if (private->window_type == GDK_WINDOW_TEMP)
     start_window = get_root (window);