summaryrefslogtreecommitdiff
path: root/src/window.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2002-08-10 17:32:29 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-08-10 17:32:29 +0000
commitc540438b913f60696e969b93d1bd9d1a5fef5af0 (patch)
tree4e13eaad03fe42b2a0285c01bc92f3614f69b3fc /src/window.c
parent154e38e71ee73d06c9e10d4eff43622ecdc6eb94 (diff)
downloadmetacity-c540438b913f60696e969b93d1bd9d1a5fef5af0.tar.gz
metacity-c540438b913f60696e969b93d1bd9d1a5fef5af0.tar.bz2
be sure window is mapped if we unmanage it and it's not withdrawn; bug
2002-08-10 Havoc Pennington <hp@pobox.com> * src/window.c (meta_window_free): be sure window is mapped if we unmanage it and it's not withdrawn; bug #90369 * src/screen.c (meta_screen_new): change string s/override/replace/ bug #89077 * src/theme.c (scale_and_alpha_pixbuf): dump the sometimes-use-NEAREST-instead-of-BILINEAR optimization, bug #87489
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/window.c b/src/window.c
index 2a3b924..95d7608 100644
--- a/src/window.c
+++ b/src/window.c
@@ -869,7 +869,10 @@ meta_window_free (MetaWindow *window)
meta_stack_remove (window->screen->stack, window);
/* FIXME restore original size if window has maximized */
-
+
+ if (window->frame)
+ meta_window_destroy_frame (window);
+
if (window->withdrawn)
{
/* We need to clean off the window's state so it
@@ -897,10 +900,15 @@ meta_window_free (MetaWindow *window)
set_wm_state (window, NormalState);
meta_error_trap_pop (window->display);
}
+
+ /* And we need to be sure the window is mapped so other WMs
+ * know that it isn't Withdrawn
+ */
+ meta_error_trap_push (window->display);
+ XMapWindow (window->display->xdisplay,
+ window->xwindow);
+ meta_error_trap_pop (window->display);
}
-
- if (window->frame)
- meta_window_destroy_frame (window);
meta_window_ungrab_keys (window);
meta_display_ungrab_window_buttons (window->display, window->xwindow);