Fix client_activate() to work for internal Openbox menus

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 91693f999ab8c7e9c490695937b3c3fd2037a372..ecb4aafe9a10cfd2b2e87abb7262c72022352167 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -3929,14 +3929,15 @@ static void client_present(ObClient *self, gboolean here, gboolean raise,
 }
 
 /* this function exists to map to the net_active_window message in the ewmh */
-void client_activate(ObClient *self, gboolean here, gboolean raise,
+void client_activate(ObClient *self, gboolean desktop, gboolean raise,
                      gboolean unshade, gboolean user)
 {
-    if ((user && (self->desktop == DESKTOP_ALL ||
+    if ((user && (desktop ||
+                  self->desktop == DESKTOP_ALL ||
                   self->desktop == screen_desktop)) ||
         client_can_steal_focus(self, event_curtime, CurrentTime))
     {
-        client_present(self, here, raise, unshade);
+        client_present(self, FALSE, raise, unshade);
     }
     else
         client_hilite(self, TRUE);