[mutter] Don't grab the server when unmanaging the screen



commit 806dabe2d79f90e005610ccca72bdced59c9feb4
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Fri Jul 11 13:17:46 2014 -0400

    Don't grab the server when unmanaging the screen
    
    There's no obvious reason for grabbing the X server when unmanaging
    a screen - the only race conditions a server grab solves are those
    related to querying and then acting on the results of the query.
    
    Our shutdown sequence is correctly ordered according to the ICCCM -
    we first unselect on the root window, and then we destroy the
    window owning WM_S<n> so removing the grab should not cause any
    problems when we are being replaced with another window manager.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733068

 src/core/screen.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/src/core/screen.c b/src/core/screen.c
index dd720c0..68f3e37 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -808,8 +808,6 @@ meta_screen_free (MetaScreen *screen,
 
   screen->closing += 1;
 
-  meta_display_grab (display);
-
   meta_compositor_unmanage (screen->display->compositor);
 
   meta_display_unmanage_windows_for_screen (display, screen, timestamp);
@@ -866,9 +864,6 @@ meta_screen_free (MetaScreen *screen,
   g_free (screen->screen_name);
 
   g_object_unref (screen);
-
-  XFlush (display->xdisplay);
-  meta_display_ungrab (display);
 }
 
 void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]