Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove otherwm

This commit is contained in:
Julien Danjou 2007-09-12 14:32:24 +02:00
parent 2d63bf2825
commit 57785860b7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
awesome.c
View File

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