[X2Go-Commits] [nx-libs] 20/51: Keyboard.c: use 'variant' all over the place
git-admin at x2go.org
git-admin at x2go.org
Fri Feb 8 05:40:05 CET 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository nx-libs.
commit 3c4a8da12fd514c4df1abcb5fbe1081dd06462fb
Author: Ulrich Sibiller <uli42 at gmx.de>
Date: Sun Dec 2 00:09:00 2018 +0100
Keyboard.c: use 'variant' all over the place
avoid mix of 'variant' and 'variants'
---
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 8 ++++----
1 file 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 b525a2a..0871a58 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);
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list