use frame->visible, not the desktop number, other states exist too, like show_desktop

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 19a10c21dd0f983643c58e0a3c78ca21419a7afd..c7739fdd19b129ca56f9813df86562faa6ade6fd 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2025,7 +2025,7 @@ void client_set_desktop(Client *self, guint target, gboolean donthide)
 
     if (target == self->desktop) return;
   
-    g_message("Setting desktop %u", target);
+    g_message("Setting desktop %u", target+1);
 
     g_assert(target < screen_num_desktops || target == DESKTOP_ALL);
 
@@ -2237,7 +2237,7 @@ gboolean client_focus(Client *self)
     /* choose the correct target */
     self = client_focus_target(self);
 
-    if (self->desktop != DESKTOP_ALL && self->desktop != screen_desktop) {
+    if (!self->frame->visible) {
         /* update the focus lists */
         focus_order_to_top(self);
         return FALSE;