From e5aee3e6b1f902e6dfe24626c8f062708aa36dad Mon Sep 17 00:00:00 2001 From: seanpringle Date: Tue, 25 Sep 2012 11:01:15 +1000 Subject: [PATCH] Revert "fix clang warnings" This reverts commit 94ab5472b9866e5fb98e1995efa44ff49a84bf45. --- action.c | 4 ++-- client.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/action.c b/action.c index 683961b..c28a22c 100644 --- a/action.c +++ b/action.c @@ -105,8 +105,8 @@ void action_focus_monitor(void *data, int num, client *cli) void action_fullscreen(void *data, int num, client *cli) { if (!cli) return; - if (cli->full && GETPROP_LONG(cli->window, atoms[XOAT_SPOT], &cli->spot, 1)); - else SETPROP_LONG(cli->window, atoms[XOAT_SPOT], &cli->spot, 1); + if (cli->full) GETPROP_LONG(cli->window, atoms[XOAT_SPOT], &cli->spot, 1); + else SETPROP_LONG(cli->window, atoms[XOAT_SPOT], &cli->spot, 1); client_toggle_state(cli, atoms[_NET_WM_STATE_FULLSCREEN]); client_place_spot(cli, cli->full ? SPOT1: cli->spot, cli->monitor, 1); client_update_border(cli); diff --git a/client.c b/client.c index d07a1f3..0c58b5a 100644 --- a/client.c +++ b/client.c @@ -63,8 +63,8 @@ client* window_build_client(Window win) { c->visible = c->attr.map_state == IsViewable ? 1:0; XGetTransientForHint(display, c->window, &c->transient); - if (!GETPROP_ATOM(win, atoms[_NET_WM_WINDOW_TYPE], &c->type, 1)) c->type = 0; - if (!GETPROP_WIND(win, atoms[WM_CLIENT_LEADER], &c->leader, 1)) c->leader = None; + GETPROP_ATOM(win, atoms[_NET_WM_WINDOW_TYPE], &c->type, 1); + GETPROP_WIND(win, atoms[WM_CLIENT_LEADER], &c->leader, 1); c->manage = !c->attr.override_redirect && c->type != atoms[_NET_WM_WINDOW_TYPE_DESKTOP] @@ -91,8 +91,7 @@ client* window_build_client(Window win) if (c->visible) { - if (!GETPROP_ATOM(c->window, atoms[_NET_WM_STATE], c->states, ATOMLIST)) - memset(c->states, 0, sizeof(Atom) * ATOMLIST); + GETPROP_ATOM(c->window, atoms[_NET_WM_STATE], c->states, ATOMLIST); c->urgent = client_has_state(c, atoms[_NET_WM_STATE_DEMANDS_ATTENTION]); c->full = client_has_state(c, atoms[_NET_WM_STATE_FULLSCREEN]); c->above = client_has_state(c, atoms[_NET_WM_STATE_ABOVE]);