aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-12-02 00:09:00 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-19 12:30:22 +0100
commit3c4a8da12fd514c4df1abcb5fbe1081dd06462fb (patch)
tree1453f844da025cd2ac90f70370b7540c3546f1a6 /nx-X11/programs/Xserver
parentd0d6c1bdba457c9e6cc5eaddbe8d94e5b2dd74ad (diff)
downloadnx-libs-3c4a8da12fd514c4df1abcb5fbe1081dd06462fb.tar.gz
nx-libs-3c4a8da12fd514c4df1abcb5fbe1081dd06462fb.tar.bz2
nx-libs-3c4a8da12fd514c4df1abcb5fbe1081dd06462fb.zip
Keyboard.c: use 'variant' all over the place
avoid mix of 'variant' and 'variants'
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keyboard.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index b525a2a9c..0871a5808 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -746,7 +746,7 @@ XkbError:
#ifdef XKB
} else { /* if (noXkbExtension) */
XkbComponentNamesRec names = {0};
- char *rules = NULL, *variants = NULL, *options = NULL; /* use xkb default */
+ char *rules = NULL, *variant = NULL, *options = NULL; /* use xkb default */
#ifdef TEST
fprintf(stderr, "nxagentKeyboardProc: Using XKB extension.\n");
@@ -864,11 +864,11 @@ XkbError:
#ifdef DEBUG
fprintf(stderr, "nxagentKeyboardProc: Going to set rules and init device: "
- "[rules='%s',model='%s',layout='%s',variants='%s',options='%s'].\n",
- rules, model, layout, variants, options);
+ "[rules='%s',model='%s',layout='%s',variant='%s',options='%s'].\n",
+ rules, model, layout, variant, options);
#endif
- XkbSetRulesDflts(rules, model, layout, variants, options);
+ XkbSetRulesDflts(rules, model, layout, variant, options);
XkbInitKeyboardDeviceStruct((void *)pDev, &names, &keySyms, modmap,
nxagentBell, nxagentChangeKeyboardControl);