summaryrefslogtreecommitdiff
path: root/openbox/client.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-10-03 04:27:44 +0000
committerDana Jansens <danakj@orodu.net>2003-10-03 04:27:44 +0000
commit242dc35a36b0056029adb4b702ed0b7ffe12feae (patch)
tree347fbe87405addd0cc6a36441cdeef5e422affdb /openbox/client.c
parente2f3c002248193d800941500c66e7b4c69b26a10 (diff)
indenting
Diffstat (limited to 'openbox/client.c')
-rw-r--r--openbox/client.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/openbox/client.c b/openbox/client.c
index 8b008e9b..643cf60b 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1747,7 +1747,7 @@ gboolean client_should_show(ObClient *self)
{
if (self->iconic) return FALSE;
else if (!(self->desktop == screen_desktop ||
- self->desktop == DESKTOP_ALL)) return FALSE;
+ self->desktop == DESKTOP_ALL)) return FALSE;
else if (client_normal(self) && screen_showing_desktop) return FALSE;
return TRUE;
@@ -2552,10 +2552,7 @@ gboolean client_can_focus(ObClient *self)
if (!self->frame->visible)
return FALSE;
- if (!((self->can_focus || self->focus_notify) &&
- (self->desktop == screen_desktop ||
- self->desktop == DESKTOP_ALL) &&
- !self->iconic))
+ if (!(self->can_focus || self->focus_notify))
return FALSE;
/* do a check to see if the window has already been unmapped or destroyed