From a13eb4e9205c8c214fe2f1c4c7be2760f4582003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= Date: Mon, 25 Jun 2012 21:53:23 +0200 Subject: [PATCH] Remove never-set variable net_state_from_client Even though net_state_from_client was never being set, it was being tested inside a if (!wwin->flags.net_state_from_client) which according to testing was always being true (probably because gcc initializes it to zero). But this situation is confusing, so it's better to remove the if() test altogether as that is the intention if net_state_from_client is not explicitly set (which it isn't in the current wmaker source). This situation is analogous to: [mafra@Pilar:c]$ cat init.c int main(void) { int a; if (!a) printf("No a = %d\n", a); return 0; } [mafra@Pilar:c]$ ./init No a = 0 --- src/window.h | 1 - src/wmspec.c | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/window.h b/src/window.h index e2d516a4..ae1e7044 100644 --- a/src/window.h +++ b/src/window.h @@ -290,7 +290,6 @@ typedef struct WWindow { unsigned int user_changed_width:1; unsigned int user_changed_height:1; - unsigned int net_state_from_client:1; /* state hint was set by client */ unsigned int net_skip_pager:1; unsigned int net_handle_icon:1; unsigned int net_show_desktop:1; diff --git a/src/wmspec.c b/src/wmspec.c index 94568414..ae870ea5 100644 --- a/src/wmspec.c +++ b/src/wmspec.c @@ -795,9 +795,7 @@ static void updateWorkspaceHint(WWindow * wwin, Bool fake, Bool del) static void updateStateHint(WWindow * wwin, Bool changedWorkspace, Bool del) { /* changeable */ if (del) { - if (!wwin->flags.net_state_from_client) { - XDeleteProperty(dpy, wwin->client_win, net_wm_state); - } + XDeleteProperty(dpy, wwin->client_win, net_wm_state); } else { Atom state[15]; /* nr of defined state atoms */ int i = 0;