[mutter/gnome-3-10] Be willing to unfocus the grab window when we are unmanaging it

[Owen Taylor <otaylor src gnome org>]

commit da55e27c3b7666c81038ae2e94cbd3733c50a251
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Wed Dec 18 09:23:08 2013 -0500

    Be willing to unfocus the grab window when we are unmanaging it
    
    When we are unmanaging the grab window, we /need/ to unfocus it,
    so we shouldn't bail out early from meta_window_focus().
    
    https://bugzilla.gnome.org/show_bug.cgi?id=711618

 src/core/window.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/core/window.c b/src/core/window.c
index 1501b1a..ca92b6d 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -5890,7 +5890,8 @@ meta_window_focus (MetaWindow  *window,
               window->desc, window->input, window->take_focus);
 
   if (window->display->grab_window &&
-      window->display->grab_window->all_keys_grabbed)
+      window->display->grab_window->all_keys_grabbed &&
+      !window->display->grab_window->unmanaging)
     {
       meta_topic (META_DEBUG_FOCUS,
                   "Current focus window %s has global keygrab, not focusing window %s after all\n",