diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-02-03 23:48:57 +1100 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2008-02-17 22:52:07 +0200 |
| commit | ab79110a84b2d299ecae0605fa535edbebd99565 (patch) | |
| tree | 83c441e49a7fc52280348646b6dc94d9553b2660 /xkb/maprules.c | |
| parent | 1332343910a1880854bae21a790cff198855cd24 (diff) | |
XKB: Remove support for pre-built keymaps
Don't load prebuilt keymaps anymore.
Diffstat (limited to 'xkb/maprules.c')
| -rw-r--r-- | xkb/maprules.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xkb/maprules.c b/xkb/maprules.c index 72e642fbe..4c947f004 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -459,7 +459,7 @@ Bool append = False; rule->types= _XkbDupString(tmp.name[TYPES]); rule->compat= _XkbDupString(tmp.name[COMPAT]); rule->geometry= _XkbDupString(tmp.name[GEOMETRY]); - rule->keymap= _XkbDupString(tmp.name[KEYMAP]); + rule->keymap= NULL; rule->layout_num = rule->variant_num = 0; for (i = 0; i < nread; i++) { @@ -589,7 +589,6 @@ XkbRF_ApplyRule( XkbRF_RulePtr rule, Apply(rule->types, &names->types); Apply(rule->compat, &names->compat); Apply(rule->geometry, &names->geometry); - Apply(rule->keymap, &names->keymap); } static Bool @@ -1279,7 +1278,6 @@ XkbRF_GroupPtr group; if (rule->types) _XkbFree(rule->types); if (rule->compat) _XkbFree(rule->compat); if (rule->geometry) _XkbFree(rule->geometry); - if (rule->keymap) _XkbFree(rule->keymap); bzero((char *)rule,sizeof(XkbRF_RuleRec)); } _XkbFree(rules->rules); |