Commit 8f2679ab authored by Ulrich Sibiller's avatar Ulrich Sibiller

Keystroke.c: make nxagentKeystrokeFileParsed local

parent 3042c506
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
extern Bool nxagentWMIsRunning; extern Bool nxagentWMIsRunning;
extern Bool nxagentIpaq; extern Bool nxagentIpaq;
extern char *nxagentKeystrokeFile; extern char *nxagentKeystrokeFile;
Bool nxagentKeystrokeFileParsed = False;
#ifdef NX_DEBUG_INPUT #ifdef NX_DEBUG_INPUT
int nxagentDebugInputDevices = 0; int nxagentDebugInputDevices = 0;
...@@ -254,10 +253,12 @@ static void parse_keystroke_file(void) ...@@ -254,10 +253,12 @@ static void parse_keystroke_file(void)
char *homefile = "/.nx/config/keystrokes.cfg"; char *homefile = "/.nx/config/keystrokes.cfg";
char *etcfile = "/etc/nxagent/keystrokes.cfg"; char *etcfile = "/etc/nxagent/keystrokes.cfg";
if (nxagentKeystrokeFileParsed) /* used for tracking if the config file parsing has already been
done (regardless of the result) */
static Bool done = False;
if (done)
return; return;
done = True;
nxagentKeystrokeFileParsed = True;
if (nxagentX2go) { if (nxagentX2go) {
homefile = "/.x2go/config/keystrokes.cfg"; homefile = "/.x2go/config/keystrokes.cfg";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment