[mutter/wip/fmuellner/focus-fix: 4/5] window: Explicitly exclude unmanaging window from focus again

[Jonas Ådahl <jadahl src gnome org>]

commit d99442d6e6b7c9b383863cc754db609398d4e65b
Author: Florian Müllner <fmuellner gnome org>
Date:   Fri May 25 21:24:17 2018 +0200

    window: Explicitly exclude unmanaging window from focus again
    
    Since commit b3b9d9e16 we no longer have to pass the unmanaging window
    to make sure we don't try to focus it again, however the parameter also
    influences the focus policy by giving ancestors preference over the normal
    stack order.
    
    https://gitlab.gnome.org/GNOME/mutter/issues/15

 src/core/window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/src/core/window.c b/src/core/window.c
index 5e0148c0b..e32366838 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1483,7 +1483,9 @@ meta_window_unmanage (MetaWindow  *window,
       meta_topic (META_DEBUG_FOCUS,
                   "Focusing default window since we're unmanaging %s\n",
                   window->desc);
-      meta_workspace_focus_default_window (workspace_manager->active_workspace, NULL, timestamp);
+      meta_workspace_focus_default_window (workspace_manager->active_workspace,
+                                           window,
+                                           timestamp);
     }
   else
     {