diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-05-08 23:23:54 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2019-05-10 19:13:31 +0200 |
| commit | fac36b24f55b02040bd6950d8de0385fdbb33703 (patch) | |
| tree | 1c83284c7be0c038601cfc41ad53ce9351b2e70a | |
| parent | 1b9d735b01dd39a2ac6c0b32e00c4f31ae0d85d6 (diff) | |
| download | nx-libs-fac36b24f55b02040bd6950d8de0385fdbb33703.tar.gz nx-libs-fac36b24f55b02040bd6950d8de0385fdbb33703.tar.bz2 nx-libs-fac36b24f55b02040bd6950d8de0385fdbb33703.zip | |
nxagent: make nxagentX2go a Boolean
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Init.c | 14 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index d02af3f8d..80ca5fac1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -183,13 +183,13 @@ int nxagentSaveUnder; int nxagentDoFullGeneration = 1; /* - * 1 if agent running as X2goAgent - * 0 if NX Agent + * True if agent is running as X2goAgent + * False if agent is running as NXAgent */ -int nxagentX2go; +Bool nxagentX2go; /* - * Checking if agent is x2go agent + * Check if agent is x2go agent */ void checkX2goAgent(void) @@ -200,13 +200,13 @@ void checkX2goAgent(void) fprintf(stderr, "%s: nxagentProgName [%s]\n", __func__, nxagentProgName); #endif - if( strcasecmp(nxagentProgName,"x2goagent") == 0) + if (strcasecmp(nxagentProgName,"x2goagent") == 0) { fprintf(stderr, "\nrunning as X2Go Agent\n"); - nxagentX2go=1; + nxagentX2go = True; } else - nxagentX2go=0; + nxagentX2go = False; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 045fa19fa..96b33ea7d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -756,7 +756,7 @@ XkbError: fprintf(stderr, "nxagentKeyboardProc: nxagentKeyboard is [%s].\n", nxagentKeyboard ? nxagentKeyboard : "NULL"); #endif - if (nxagentX2go == 1 && nxagentKeyboard && (strcmp(nxagentKeyboard, "null/null") == 0)) + if (nxagentX2go && nxagentKeyboard && (strcmp(nxagentKeyboard, "null/null") == 0)) { #ifdef TEST fprintf(stderr, "%s: changing nxagentKeyboard from [null/null] to [clone].\n", __func__); @@ -874,7 +874,7 @@ XkbError: * method for switching that off is the creation of a dir * instead of a file. */ - if (nxagentX2go == 1) + if (nxagentX2go) { nxagentWriteKeyboardDir(); } @@ -894,7 +894,7 @@ XkbError: * know about that yet. Once x2go starts using clone * we can drop this here. */ - if (nxagentX2go == 1) + if (nxagentX2go) { nxagentWriteKeyboardFile(nxagentRemoteRules, nxagentRemoteModel, nxagentRemoteLayout, nxagentRemoteVariant, nxagentRemoteOptions); } |