Use meta_window_located_on_workspace() in more places

https://bugzilla.gnome.org/show_bug.cgi?id=691744
2013-01-18 14:55:23 -05:00
parent d8eb47e2b7
commit df15843407
3 changed files with 5 additions and 9 deletions
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@ -1292,8 +1292,7 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
      ancestor = NULL;
      meta_window_foreach_ancestor (not_this_one, record_ancestor, &ancestor);
      if (ancestor != NULL &&
-          (ancestor->on_all_workspaces ||
-           ancestor->workspace == workspace) &&
+          meta_window_located_on_workspace (ancestor, workspace) &&
          meta_window_showing_on_its_workspace (ancestor))
        {
          meta_topic (META_DEBUG_FOCUS,