metacity r3678 - in trunk: . src/core

[iain svn gnome org]

Author: iain
Date: Mon Apr  7 23:32:35 2008
New Revision: 3678
URL: http://svn.gnome.org/viewvc/metacity?rev=3678&view=rev

Log:
2008-04-07  iain  <iain gnome org>

        * src/core/compositor.c (hide_overlay_window): Hide the overlay 
window
        (meta_compositor_unmanage_screen): Release the compositor 
overlay.
        (#526770)



Modified:
   trunk/ChangeLog
   trunk/src/core/compositor.c

Modified: trunk/src/core/compositor.c
==============================================================================
--- trunk/src/core/compositor.c	(original)
+++ trunk/src/core/compositor.c	Mon Apr  7 23:32:35 2008
@@ -2407,11 +2407,11 @@
 #endif
 }
 
-#if 0
 static void
 hide_overlay_window (MetaScreen *screen,
                      Window      cow)
 {
+#ifdef HAVE_COW
   MetaDisplay *display = screen->display;
   XserverRegion region;
 
@@ -2420,8 +2420,8 @@
                               cow, ShapeBounding,
                               0, 0, region);
   XFixesDestroyRegion (display->xdisplay, region);
-}
 #endif
+}
 
 static Window
 get_output_window (MetaScreen *screen)
@@ -2544,6 +2544,8 @@
 
   info = screen->compositor_data;
 
+  hide_overlay_window (screen, info->output);
+
   /* Destroy the windows */
   for (index = info->windows; index; index = index->next) 
     {
@@ -2571,6 +2573,10 @@
                                   CompositeRedirectManual);
   meta_screen_unset_cm_selection (screen);
 
+#ifdef HAVE_COW
+  XCompositeReleaseOverlayWindow (display->xdisplay, info->output);
+#endif
+
   g_free (info);
   screen->compositor_data = NULL;
 #endif