summaryrefslogtreecommitdiff
path: root/xkb/ddxLoad.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/ddxLoad.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/ddxLoad.c')
-rw-r--r--xkb/ddxLoad.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 8d7f8377b..6954dd150 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -177,7 +177,7 @@ OutputDirectory(
}
}
-static Bool
+static Bool
XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
XkbComponentNamesPtr names,
unsigned want,
@@ -204,7 +204,6 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
snprintf(keymap, sizeof(keymap), "server-%s", display);
- XkbEnsureSafeMapName(keymap);
OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
#ifdef WIN32