diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2004-07-09 23:06:35 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-07-09 23:06:35 +0000 |
| commit | d7da887ee6df776a1c7fe6fffb2169b76a2c79ed (patch) | |
| tree | 2d9522b44f9c9ddf5c09086f2e2e77a6b0845776 | |
| parent | 69ab514aefe770ed16f823286c488eee24610bef (diff) | |
| download | gdk-pixbuf-d7da887ee6df776a1c7fe6fffb2169b76a2c79ed.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 15 |
5 files changed, 34 insertions, 5 deletions
@@ -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 9e6286cb8..3ad0bdd9a 100644 --- 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 9e6286cb8..3ad0bdd9a 100644 --- 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 9e6286cb8..3ad0bdd9a 100644 --- 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 0214177f4..9ff786dff 100644 --- 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); |