diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-10-22 14:35:08 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-10-22 14:35:08 +0200 |
| commit | 7392dd6a9b550538a5b7f2aa5204c805c15a9d6a (patch) | |
| tree | e2f5a8fc5b50ed8eeeb018ffb7051f888b7dd5f1 /nx-X11/programs/Xserver/hw/nxagent/Atoms.c | |
| parent | c478ba2937b6a7e6c55b615ddeac3ca525f6a743 (diff) | |
| parent | 450760bcafc8d2a708b9f6087f3c0c2cdab046a8 (diff) | |
| download | nx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.tar.gz nx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.tar.bz2 nx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.zip | |
Merge branch 'uli42-pr/cleanup_wmisrunning' into 3.6.x
Attributes GH PR #728: https://github.com/ArcticaProject/nx-libs/pull/728
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Atoms.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index 1e9a4bd37..c36c38e2f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -106,7 +106,7 @@ static void catchAndRedirect(Display* dpy, XErrorEvent* X) X -> request_code == X_ChangeWindowAttributes && X -> resourceid == DefaultRootWindow(dpy)) { - nxagentWMIsRunning = TRUE; + nxagentWMIsRunning = True; } else { @@ -122,7 +122,7 @@ static void startWMDetection(void) * window. */ - nxagentWMIsRunning = FALSE; + nxagentWMIsRunning = False; previousErrorHandler = XSetErrorHandler((XErrorHandler)&catchAndRedirect); @@ -166,7 +166,7 @@ static void finishWMDetection(Bool verbose) void nxagentWMDetect() { Bool verbose = False; - int windowManagerWasRunning = nxagentWMIsRunning; + Bool windowManagerWasRunning = nxagentWMIsRunning; startWMDetection(); |