From 212a9f26ab84733040045eef34ae820e6c0e24fc Mon Sep 17 00:00:00 2001 From: Iain Holmes Date: Thu, 27 Dec 2007 23:51:29 +0000 Subject: [PATCH] Don't do anything in meta_compositor_free_window. It doesn't seem to be needed and breaks stuff badly (disappearing windows) svn path=/trunk/; revision=3500 --- ChangeLog | 6 ++++++ src/core/compositor.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3029608e7..64727ce74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-12-27 Iain Holmes + + * src/core/compositor.c: Don't do anything in + meta_compositor_free_window, it doesn't seem to be needed and breaks + things very badly. http://bugzilla.gnome.org/show_bug.cgi?id=504876 + 2007-12-27 Iain Holmes * src/core/compositor.c: When a window is mapped, don't set damaged to diff --git a/src/core/compositor.c b/src/core/compositor.c index 88c0c5150..aa3a877aa 100644 --- a/src/core/compositor.c +++ b/src/core/compositor.c @@ -1684,7 +1684,7 @@ destroy_win (MetaDisplay *display, MetaCompWindow *cw; cw = find_window_in_display (display, xwindow); - + if (cw == NULL) return; @@ -2106,6 +2106,7 @@ process_unmap (MetaCompositor *compositor, return; } + cw = find_window_in_display (compositor->display, event->window); if (cw) unmap_win (compositor->display, cw->screen, event->window); @@ -2493,7 +2494,14 @@ meta_compositor_free_window (MetaCompositor *compositor, MetaWindow *window) { #ifdef HAVE_COMPOSITE_EXTENSIONS - destroy_win (compositor->display, window->xwindow, FALSE); + /* FIXME: When an undecorated window is hidden this is called, + but the window does not get readded if it is subsequentally shown again + See http://bugzilla.gnome.org/show_bug.cgi?id=504876 + + I don't *think* theres any need for this call anyway, leaving it out + does not seem to cause any side effects so far, but I should check with + someone who understands more. */ + /* destroy_win (compositor->display, window->xwindow, FALSE); */ #endif }