summaryrefslogtreecommitdiff
path: root/xkb/ddxList.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2008-07-18 16:29:35 +0300
committerDaniel Stone <daniel@fooishbar.org>2009-01-22 15:08:56 +1100
commit1ad80678d88525159e55bb814205fd4eaca060a3 (patch)
tree1c44006af6a88624333e1f6ec46bd14d21607a73 /xkb/ddxList.c
parent133e0bd6f1cc147a2ddbbe1519d10300e7dbe669 (diff)
XKB: Remove support for setting combined keymaps
We don't do full keymaps anymore. Deal. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'xkb/ddxList.c')
-rw-r--r--xkb/ddxList.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/xkb/ddxList.c b/xkb/ddxList.c
index da2f9a8bf..3ff3d81b4 100644
--- a/xkb/ddxList.c
+++ b/xkb/ddxList.c
@@ -61,7 +61,7 @@ extern int Win32System(const char *cmdline);
/***====================================================================***/
static char *componentDirs[_XkbListNumComponents] = {
- "keymap", "keycodes", "types", "compat", "symbols", "geometry"
+ "keycodes", "types", "compat", "symbols", "geometry"
};
/***====================================================================***/
@@ -280,9 +280,7 @@ XkbDDXList(DeviceIntPtr dev,XkbSrvListInfoPtr list,ClientPtr client)
{
Status status;
- status= XkbDDXListComponent(dev,_XkbListKeymaps,list,client);
- if (status==Success)
- status= XkbDDXListComponent(dev,_XkbListKeycodes,list,client);
+ status= XkbDDXListComponent(dev,_XkbListKeycodes,list,client);
if (status==Success)
status= XkbDDXListComponent(dev,_XkbListTypes,list,client);
if (status==Success)