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/xkbfmisc.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/xkbfmisc.c')
| -rw-r--r-- | xorg-server/xkb/xkbfmisc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/xkb/xkbfmisc.c b/xorg-server/xkb/xkbfmisc.c index 52ef6362c..804ef2080 100644 --- a/xorg-server/xkb/xkbfmisc.c +++ b/xorg-server/xkb/xkbfmisc.c @@ -240,7 +240,7 @@ unsigned wantNames,wantConfig,wantDflts; if ((xkb!=NULL) && (old_names!=NULL)) { if (wantNames&XkmTypesMask) { if (old_names->types!=None) { - tmp= XkbAtomGetString(old_names->types); + tmp= NameForAtom(old_names->types); names->types= _XkbDupString(tmp); } else { @@ -250,7 +250,7 @@ unsigned wantNames,wantConfig,wantDflts; } if (wantNames&XkmCompatMapMask) { if (old_names->compat!=None) { - tmp= XkbAtomGetString(old_names->compat); + tmp= NameForAtom(old_names->compat); names->compat= _XkbDupString(tmp); } else wantDflts|= XkmCompatMapMask; @@ -259,13 +259,13 @@ unsigned wantNames,wantConfig,wantDflts; if (wantNames&XkmSymbolsMask) { if (old_names->symbols==None) return False; - tmp= XkbAtomGetString(old_names->symbols); + tmp= NameForAtom(old_names->symbols); names->symbols= _XkbDupString(tmp); complete|= XkmSymbolsMask; } if (wantNames&XkmKeyNamesMask) { if (old_names->keycodes!=None) { - tmp= XkbAtomGetString(old_names->keycodes); + tmp= NameForAtom(old_names->keycodes); names->keycodes= _XkbDupString(tmp); } else wantDflts|= XkmKeyNamesMask; @@ -274,7 +274,7 @@ unsigned wantNames,wantConfig,wantDflts; if (wantNames&XkmGeometryMask) { if (old_names->geometry==None) return False; - tmp= XkbAtomGetString(old_names->geometry); + tmp= NameForAtom(old_names->geometry); names->geometry= _XkbDupString(tmp); complete|= XkmGeometryMask; wantNames&= ~XkmGeometryMask; |