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>
This commit is contained in:
Peter Hutterer 2010-01-15 15:32:13 +10:00 • committed by Keith Packard
commit c8bba14a39
4 changed files with 8 additions and 10 deletions

View file

@ -74,7 +74,7 @@ XkbAtomText(Atom atm,unsigned format)
const char *atmstr;
char *rtrn,*tmp;
atmstr = XkbAtomGetString(atm);
atmstr = NameForAtom(atm);
if (atmstr != NULL) {
int len;
len= strlen(atmstr)+1;
@ -118,7 +118,7 @@ char numBuf[20];
if (ndx>=XkbNumVirtualMods)
tmp= "illegal";
else if (vmodNames&&(vmodNames[ndx]!=None))
tmp= XkbAtomGetString(vmodNames[ndx]);
tmp= NameForAtom(vmodNames[ndx]);
if (tmp==NULL) {
sprintf(numBuf,"%d",ndx);
tmp = numBuf;