From 57785860b7d9497d8c02adb4555ae9574c3ad15b Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Wed, 12 Sep 2007 14:32:24 +0200
Subject: [PATCH] remove otherwm

---
 awesome.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/awesome.c b/awesome.c
index b096349a..5d1b8d2e 100644
--- a/awesome.c
+++ b/awesome.c
@@ -45,7 +45,7 @@ DC dc;
 /* static */
 
 static int (*xerrorxlib) (Display *, XErrorEvent *);
-static Bool otherwm = False, readin = True;
+static Bool readin = True;
 static Bool running = True;
 
 
@@ -208,11 +208,10 @@ setup(Display *disp, awesome_config *awesomeconf)
  * Startup Error handler to check if another window manager
  * is already running.
  */
-static int
+static int __attribute__ ((noreturn))
 xerrorstart(Display * dsply __attribute__ ((unused)), XErrorEvent * ee __attribute__ ((unused)))
 {
-    otherwm = True;
-    return -1;
+    eprint("awesome: another window manager is already running\n");
 }
 
 /* extern */
@@ -305,9 +304,6 @@ main(int argc, char *argv[])
     XSelectInput(dpy, root, SubstructureRedirectMask);
     XSync(dpy, False);
 
-    if(otherwm)
-        eprint("awesome: another window manager is already running\n");
-
     XSync(dpy, False);
     XSetErrorHandler(NULL);
     xerrorxlib = XSetErrorHandler(xerror);