diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-01-15 15:32:13 +1000 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2017-03-03 21:33:34 +0100 |
| commit | 9e29588dd09eec1824b3b49fb9368f22e78ce790 (patch) | |
| tree | 826cdbe667bba1c722b7747dc661037dba4bd20c /nx-X11/programs/Xserver/xkb/xkbtext.c | |
| parent | bdfb52193b5a2c5e44969b11d997ce19f0310af9 (diff) | |
| download | nx-libs-9e29588dd09eec1824b3b49fb9368f22e78ce790.tar.gz nx-libs-9e29588dd09eec1824b3b49fb9368f22e78ce790.tar.bz2 nx-libs-9e29588dd09eec1824b3b49fb9368f22e78ce790.zip | |
xkb: remove XkbAtomGetString, replace with NameForAtom.
XKB really XKBdoes not XKBneed its own XKBdefines for XKBeverything.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
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); |