about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R Garbe <garbeam@gmail.com>2008-09-06 08:59:51 +0100
committerAnselm R Garbe <garbeam@gmail.com>2008-09-06 08:59:51 +0100
commit9a4d07d9de31c7bf3fba83c66d1a09d63848adfc (patch)
treee5acb2bd054a6a6dce72cbab3def80cc3da2604d
parent30410108eb7e9e8b977d448f611659d58b2a6992 (diff)
downloaddwm-9a4d07d9de31c7bf3fba83c66d1a09d63848adfc.tar.gz
applied Martin Hurton's checkotherwm simplification
-rw-r--r--dwm.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/dwm.c b/dwm.c
index 4ed5760..e7804dc 100644
--- a/dwm.c
+++ b/dwm.c
@@ -337,15 +337,14 @@ buttonpress(XEvent *e) {
 void
 checkotherwm(void) {
 	otherwm = False;
-	XSetErrorHandler(xerrorstart);
+	xerrorxlib = XSetErrorHandler(xerrorstart);
 
 	/* this causes an error if some other window manager is running */
 	XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
 	XSync(dpy, False);
 	if(otherwm)
 		die("dwm: another window manager is already running\n");
-	XSetErrorHandler(NULL);
-	xerrorxlib = XSetErrorHandler(xerror);
+	XSetErrorHandler(xerror);
 	XSync(dpy, False);
 }
 
@@ -1625,7 +1624,7 @@ updatesizehints(Client *c) {
 	else
 		c->maxa = c->mina = 0.0;
 	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
-			&& c->maxw == c->minw && c->maxh == c->minh);
+	             && c->maxw == c->minw && c->maxh == c->minh);
 }
 
 void