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/Render.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/Render.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Render.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index b58a16f3d..9d91b1ff1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -2784,7 +2784,7 @@ void nxagentReconnectGlyphSet(void* p0, XID x1, void *p2) Bool nxagentReconnectAllGlyphSet(void *p) { - Bool success = TRUE; + Bool success = True; int i; nxagentQueryFormats(); @@ -2826,7 +2826,7 @@ void nxagentReconnectPicture(void * p0, XID x1, void *p2) * and that the involved objects are valid. */ - if (*pBool == 0 || pPicture == NULL || + if (!*pBool || pPicture == NULL || nxagentPicture(pPicture) != 0) { return; @@ -2959,7 +2959,7 @@ Bool nxagentReconnectAllPicture(void *p) fprintf(stderr, "nxagentReconnectAllPicture: Going to recreate all pictures.\n"); #endif - for (i = 0, r = 1; i < MAXCLIENTS; i++) + for (i = 0, r = True; i < MAXCLIENTS; i++) { if (clients[i]) { @@ -2967,7 +2967,7 @@ Bool nxagentReconnectAllPicture(void *p) #ifdef WARNING - if (r == False) + if (!r) { fprintf(stderr, "nxagentReconnectAllPicture: WARNING! Failed to recreate " "picture for client [%d].\n", i); @@ -3015,7 +3015,7 @@ Bool nxagentDisconnectAllPicture(void) fprintf(stderr, "nxagentDisconnectAllPicture.\n"); #endif - for (i = 0, r = 1; i < MAXCLIENTS; i++) + for (i = 0, r = True; i < MAXCLIENTS; i++) { if (clients[i]) { @@ -3023,7 +3023,7 @@ Bool nxagentDisconnectAllPicture(void) #ifdef WARNING - if (r == False) + if (!r) { fprintf(stderr, "nxagentDisconnectAllPicture: WARNING! Failed to disconnect " "picture for client [%d].\n", i); |