From: Dana Jansens <danakj@orodu.net>
Date: Sun, 11 Mar 2007 19:27:16 +0000 (+0000)
Subject: .. i am pretending to be mika :D :D ok this time for real
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=d9601bc196c130adfc14af73261919b9a7aa3db2;p=chaz%2Fopenbox

.. i am pretending to be mika :D :D ok this time for real
---

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;
             }