diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-25 08:22:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-25 08:22:27 +0000 |
| commit | 724396e50bc811ea09416afbe00a8420d60647bf (patch) | |
| tree | fd5f6baeaad8ae7cc680dae46e1ae633544ee2a9 /xorg-server/xkb/xkbtext.c | |
| parent | 2ddb9669098ba260d0667276b5d1e7999c72b993 (diff) | |
| parent | a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a (diff) | |
| download | vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.tar.gz vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.tar.bz2 vcxsrv-724396e50bc811ea09416afbe00a8420d60647bf.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/xkbtext.c')
| -rw-r--r-- | xorg-server/xkb/xkbtext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkb/xkbtext.c b/xorg-server/xkb/xkbtext.c index 95ad01378..324254dd3 100644 --- a/xorg-server/xkb/xkbtext.c +++ b/xorg-server/xkb/xkbtext.c @@ -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; |