[mutter/wip/rstrode/rhel-8.0.0: 19/117] window: Explicitly exclude unmanaging window from focus again

[Ray Strode <halfline src gnome org>]

commit 988fac3f1839c1a1af46c01310db4af5587440de
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
    
    (cherry picked from commit d99442d6e6b7c9b383863cc754db609398d4e65b)

 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 d17f8838b..d69720a4d 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1469,7 +1469,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 (window->screen->active_workspace, NULL, timestamp);
+      meta_workspace_focus_default_window (window->screen->active_workspace,
+                                           window,
+                                           timestamp);
     }
   else
     {