diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 22:44:58 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 22:44:58 +0100 |
| commit | 05aabb4e6f45bcb2c951ec04026f9d7bce7335b3 (patch) | |
| tree | 7eb1bb1a0e4633e77edf9d3d8e3829849303f1cd /nx-X11/programs/Xserver/xkb/xkbtext.c | |
| parent | 96e2556031c8aff62a4650b9cfb814991f5240e1 (diff) | |
| parent | 06bb154df0a4d6e35885bce6a63057bd8f8636e8 (diff) | |
| download | nx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.tar.gz nx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.tar.bz2 nx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.zip | |
Merge branch 'uli42-pr/fix_validatestring' into 3.6.x
Attributes GH PR #359: https://github.com/ArcticaProject/nx-libs/pull/359
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbtext.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbtext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbtext.c b/nx-X11/programs/Xserver/xkb/xkbtext.c index 273ba5aae..7c22d25c8 100644 --- a/nx-X11/programs/Xserver/xkb/xkbtext.c +++ b/nx-X11/programs/Xserver/xkb/xkbtext.c @@ -75,7 +75,7 @@ XkbAtomText(Display *dpy,Atom atm,unsigned format) { char *rtrn,*tmp; - tmp= (char *)XkbAtomGetString(dpy,atm); + tmp= (char *)NameForAtom(atm); if (tmp!=NULL) { int len; len= strlen(tmp)+1; @@ -118,7 +118,7 @@ char numBuf[20]; if (ndx>=XkbNumVirtualMods) tmp= "illegal"; else if (vmodNames&&(vmodNames[ndx]!=None)) - tmp= (char *)XkbAtomGetString(dpy,vmodNames[ndx]); + tmp= (char *)NameForAtom(vmodNames[ndx]); if (tmp==NULL) sprintf(tmp=numBuf,"%d",ndx); |