From 8f2e3f5fe16aeb0324aa5ee2b2c30a83ec724ad0 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 12 Jun 2007 17:46:16 +0000
Subject: use the same decision code to focus new windows as for focus cycling
 or focus fallback. yay consistency.

---
 openbox/focus_cycle_popup.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'openbox/focus_cycle_popup.c')

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 3ec14a5c..581fa215 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -22,7 +22,6 @@
 #include "client.h"
 #include "screen.h"
 #include "focus.h"
-#include "focus_cycle.h"
 #include "openbox.h"
 #include "window.h"
 #include "event.h"
@@ -175,11 +174,11 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
     for (it = g_list_last(focus_order); it; it = g_list_previous(it)) {
         ObClient *ft = it->data;
 
-        if (focus_cycle_target_valid(ft,
-                                     iconic_windows,
-                                     all_desktops,
-                                     dock_windows,
-                                     desktop_windows))
+        if (focus_valid_target(ft,
+                               iconic_windows,
+                               all_desktops,
+                               dock_windows,
+                               desktop_windows))
         {
             gchar *text = popup_get_name(ft);
 
-- 
cgit v1.2.3