[gnome-shell/gnome-41] Revert "shell/app: Do not try to activate OR windows"

[Florian MĂźllner <fmuellner src gnome org>]

commit 13e9eb8bab71e0201cfc41bff176812b1ba14637
Author: Florian MĂźllner <fmuellner gnome org>
Date:   Sun Mar 20 19:15:58 2022 +0100

    Revert "shell/app: Do not try to activate OR windows"
    
    Now that shell_app_get_windows() itself filters out OR windows, this is
    no longer needed.
    
    This reverts commit f9037f5889801c80d15ee3dc45c9a9f8cc57feba.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5233
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2252>
    (cherry picked from commit e4446cd15ce46bcfddcd1e35ac3f0e70cb132991)

 src/shell-app.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/src/shell-app.c b/src/shell-app.c
index c87fec395e..70f7cf8fe5 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -423,19 +423,8 @@ shell_app_activate_window (ShellApp     *app,
     return;
 
   windows = shell_app_get_windows (app);
-  if (window == NULL)
-    {
-      for (GSList *l = windows; l; l = l->next)
-        {
-          MetaWindow *current_window = l->data;
-
-          if (!meta_window_is_override_redirect (current_window))
-            {
-              window = current_window;
-              break;
-            }
-        }
-    }
+  if (window == NULL && windows)
+    window = windows->data;
 
   if (!g_slist_find (windows, window))
     return;
@@ -464,9 +453,7 @@ shell_app_activate_window (ShellApp     *app,
         {
           MetaWindow *other_window = iter->data;
 
-          if (other_window != window &&
-              !meta_window_is_override_redirect (other_window) &&
-              meta_window_get_workspace (other_window) == workspace)
+          if (other_window != window && meta_window_get_workspace (other_window) == workspace)
             meta_window_raise (other_window);
         }
       g_slist_free (windows_reversed);