summaryrefslogtreecommitdiff
path: root/xkb
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2006-03-25 22:35:48 +0000
committerDaniel Stone <daniel@fooishbar.org>2006-03-25 22:35:48 +0000
commit1ef60ce8ebb681b3cfb5e515be5c187c0442dcda (patch)
tree87d5de1bbbd1a56a65695b13093e9fa7acc89c17 /xkb
parentec10f70b2114e5369a5b2f34b084dcf55634dcb4 (diff)
Really remove all DDX pre-config code.
Diffstat (limited to 'xkb')
-rw-r--r--xkb/xkbInit.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index a1d1305e2..ded506bc6 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -1,5 +1,5 @@
/* $Xorg: xkbInit.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */
-/* $XdotOrg: xserver/xorg/xkb/xkbInit.c,v 1.11 2006/02/15 20:44:13 ajax Exp $ */
+/* $XdotOrg: xserver/xorg/xkb/xkbInit.c,v 1.12 2006/03/25 21:52:49 daniels Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -688,30 +688,6 @@ XkbRF_VarDefsRec defs;
XkbSetRulesUsed(&defs);
}
}
- if (cfgNames.keymap){
- if (names->keymap) _XkbFree(names->keymap);
- names->keymap= cfgNames.keymap;
- }
- if (cfgNames.keycodes){
- if (names->keycodes) _XkbFree(names->keycodes);
- names->keycodes= cfgNames.keycodes;
- }
- if (cfgNames.types) {
- if (names->types) _XkbFree(names->types);
- names->types= cfgNames.types;
- }
- if (cfgNames.compat) {
- if (names->compat) _XkbFree(names->compat);
- names->compat= cfgNames.compat;
- }
- if (cfgNames.symbols){
- if (names->symbols) _XkbFree(names->symbols);
- names->symbols= cfgNames.symbols;
- }
- if (cfgNames.geometry) {
- if (names->geometry) _XkbFree(names->geometry);
- names->geometry= cfgNames.geometry;
- }
if (names->keymap) {
XkbComponentNamesRec tmpNames;