Make focus_valid_target() take a desktop argument.

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 184ae171e8d2b50a0fee2f1a64391cd36eb6a81a..98a27dc947bd78331328d2062decc86ae72cff94 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -38,7 +38,7 @@
 #include "menuframe.h"
 #include "keyboard.h"
 #include "mouse.h"
-#include "render/render.h"
+#include "obrender/render.h"
 #include "gettext.h"
 #include "obt/display.h"
 #include "obt/prop.h"
@@ -290,7 +290,8 @@ void client_manage(Window window, ObPrompt *prompt)
         (user_time != 0) &&
         /* this checks for focus=false for the window */
         (!settings || settings->focus != 0) &&
-        focus_valid_target(self, FALSE, FALSE, TRUE, FALSE, FALSE,
+        focus_valid_target(self, self->desktop,
+                           FALSE, FALSE, TRUE, FALSE, FALSE,
                            settings->focus == 1))
     {
         activate = TRUE;