summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-03-11 19:27:16 +0000
committerDana Jansens <danakj@orodu.net>2007-03-11 19:27:16 +0000
commitd9601bc196c130adfc14af73261919b9a7aa3db2 (patch)
tree2c0aa69e72d0261f9a12641f0452cac9f9fc4af1
parentd98a6183a38a8f2b88707c3b4955d10dc09e4a71 (diff)
.. i am pretending to be mika :D :D ok this time for real
-rw-r--r--openbox/client.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/openbox/client.c b/openbox/client.c
index 5408b18f..8358293d 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -468,8 +468,7 @@ void client_manage(Window window)
/* If a nothing at all, or a parent was focused, then focus this
always
*/
- if (client_search_focus_parent(self) != NULL ||
- !focus_client)
+ if (!focus_client || client_search_focus_parent(self) != NULL)
{
activate = TRUE;
}
@@ -481,8 +480,7 @@ void client_manage(Window window)
/* Don't steal focus from globally active clients.
I stole this idea from KWin. It seems nice.
*/
- if (focus_client && !focus_client->can_focus &&
- focus_client->focus_notify)
+ if (!focus_client->can_focus && focus_client->focus_notify)
{
activate = FALSE;
}