diff options
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbfmisc.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbfmisc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbfmisc.c b/nx-X11/programs/Xserver/xkb/xkbfmisc.c index 3f5a57e93..1c040cd2e 100644 --- a/nx-X11/programs/Xserver/xkb/xkbfmisc.c +++ b/nx-X11/programs/Xserver/xkb/xkbfmisc.c @@ -333,7 +333,7 @@ XkbFileInfo finfo; if ((xkb!=NULL) && (old_names!=NULL)) { if (wantNames&XkmTypesMask) { if (old_names->types!=None) { - tmp= XkbAtomGetString(dpy,old_names->types); + tmp= NameForAtom(old_names->types); names->types= Xstrdup(tmp); } else { @@ -343,7 +343,7 @@ XkbFileInfo finfo; } if (wantNames&XkmCompatMapMask) { if (old_names->compat!=None) { - tmp= XkbAtomGetString(dpy,old_names->compat); + tmp= NameForAtom(old_names->compat); names->compat= Xstrdup(tmp); } else wantDflts|= XkmCompatMapMask; @@ -352,13 +352,13 @@ XkbFileInfo finfo; if (wantNames&XkmSymbolsMask) { if (old_names->symbols==None) return False; - tmp= XkbAtomGetString(dpy,old_names->symbols); + tmp= NameForAtom(old_names->symbols); names->symbols= Xstrdup(tmp); complete|= XkmSymbolsMask; } if (wantNames&XkmKeyNamesMask) { if (old_names->keycodes!=None) { - tmp= XkbAtomGetString(dpy,old_names->keycodes); + tmp= NameForAtom(old_names->keycodes); names->keycodes= Xstrdup(tmp); } else wantDflts|= XkmKeyNamesMask; @@ -367,7 +367,7 @@ XkbFileInfo finfo; if (wantNames&XkmGeometryMask) { if (old_names->geometry==None) return False; - tmp= XkbAtomGetString(dpy,old_names->geometry); + tmp= NameForAtom(old_names->geometry); names->geometry= Xstrdup(tmp); complete|= XkmGeometryMask; wantNames&= ~XkmGeometryMask; |