diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2017-02-16 20:53:04 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-07-03 16:29:16 +0200 |
| commit | ec0cfcecf31dbb504e8a09e59dd877f883a1c030 (patch) | |
| tree | afb7fbb88b45e9e96fe300f7064dfdd207192072 /nx-X11/programs/Xserver/xkb/xkbUtils.c | |
| parent | cc27ebb2558770f97448e38cc3f017b60f02d6b8 (diff) | |
| download | nx-libs-ec0cfcecf31dbb504e8a09e59dd877f883a1c030.tar.gz nx-libs-ec0cfcecf31dbb504e8a09e59dd877f883a1c030.tar.bz2 nx-libs-ec0cfcecf31dbb504e8a09e59dd877f883a1c030.zip | |
Xserver/xkb: Remove -xkbmap argument.
Backported from X.org:
commit fd8bde8bb0f9d796b3464973b53285c0a6d22a31
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon May 29 11:14:03 2006 +0000
Remove -xkbmap argument.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbUtils.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbUtils.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c index 4adcc878d..fa252b10b 100644 --- a/nx-X11/programs/Xserver/xkb/xkbUtils.c +++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c @@ -859,26 +859,6 @@ XkbDescPtr xkb= xkbi->desc; } if ((xkb->geom!=NULL)&&(xkb->geom->name==name)) return xkb->geom; - else if ((name==xkb->names->geometry)&&(xkb->geom==NULL)) { - FILE *file= XkbDDXOpenConfigFile(XkbInitialMap,NULL,0); - if (file!=NULL) { - XkbFileInfo xkbFInfo; - xkmFileInfo finfo; - xkmSectionInfo toc[MAX_TOC],*entry; - bzero(&xkbFInfo,sizeof(xkbFInfo)); - xkbFInfo.xkb= xkb; - if (XkmReadTOC(file,&finfo,MAX_TOC,toc)) { - entry= XkmFindTOCEntry(&finfo,toc,XkmGeometryIndex); - if (entry!=NULL) - XkmReadFileSection(file,entry,&xkbFInfo,NULL); - } - fclose(file); - if (xkb->geom) { - *shouldFree= 0; - return xkb->geom; - } - } - } *shouldFree= 1; return NULL; } |