cvsimport

1 files changed, 6 insertions, 8 deletions

diff --git a/xevents.c b/xevents.c
index 8e17241..1713cd5 100644
--- a/xevents.c
+++ b/xevents.c
@@ -209,7 +209,7 @@ xev_handle_propertynotify(XEvent *ee)
 	} else {
 		TAILQ_FOREACH(sc, &Screenq, entry) {
 			if (sc->rootwin == e->window) {
-				if (e->atom == ewmh[_NET_DESKTOP_NAMES].atom)
+				if (e->atom == ewmh[_NET_DESKTOP_NAMES])
 					group_update_names(sc);
 			}
 		}
@@ -348,22 +348,20 @@ xev_handle_clientmessage(XEvent *ee)
 	if ((cc = client_find(e->window)) == NULL)
 		return;
 
-	if (e->message_type == cwmh[WM_CHANGE_STATE].atom &&
-	    e->format == 32 && e->data.l[0] == IconicState)
+	if (e->message_type == cwmh[WM_CHANGE_STATE] && e->format == 32 &&
+	    e->data.l[0] == IconicState)
 		client_hide(cc);
 
-	if (e->message_type == ewmh[_NET_CLOSE_WINDOW].atom)
+	if (e->message_type == ewmh[_NET_CLOSE_WINDOW])
 		client_send_delete(cc);
 
-	if (e->message_type == ewmh[_NET_ACTIVE_WINDOW].atom &&
-	    e->format == 32) {
+	if (e->message_type == ewmh[_NET_ACTIVE_WINDOW] && e->format == 32) {
 		old_cc = client_current();
 		if (old_cc)
 			client_ptrsave(old_cc);
 		client_ptrwarp(cc);
 	}
-	if (e->message_type == ewmh[_NET_WM_STATE].atom &&
-	    e->format == 32)
+	if (e->message_type == ewmh[_NET_WM_STATE] && e->format == 32)
 		xu_ewmh_handle_net_wm_state_msg(cc,
 		    e->data.l[0], e->data.l[1], e->data.l[2]);
 }