diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-08-04 15:15:24 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-08-05 07:59:33 +1000 |
| commit | e7c950c6273ff93f25c091c93d86da6e332a2277 (patch) | |
| tree | 5347490513b3a586b4f0bceeca77b6cc895321bc /hw/dmx/input | |
| parent | 2cde9208ff756e33d162e2324f4b99540230d743 (diff) | |
dmx: fix a call to XkbSetRulesDflts, takes XkbRMLVOSet now.
Diffstat (limited to 'hw/dmx/input')
| -rw-r--r-- | hw/dmx/input/dmxinputinit.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index 478196ec4..9c316aaba 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -381,12 +381,15 @@ static void dmxKeyboardFreeNames(XkbComponentNamesPtr names) static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info) { GETDMXINPUTFROMPDEVICE; + XkbRMLVOSet rmlvo; - XkbSetRulesDflts(dmxConfigGetXkbRules(), - dmxConfigGetXkbModel(), - dmxConfigGetXkbLayout(), - dmxConfigGetXkbVariant(), - dmxConfigGetXkbOptions()); + rmlvo.rules = dmxConfigGetXkbRules(); + rmlvo.model = dmxConfigGetXkbModel(); + rmlvo.layout = dmxConfigGetXkbLayout(); + rmlvo.variant = dmxConfigGetXkbVariant(); + rmlvo.options = dmxConfigGetXkbOptions(); + + XkbSetRulesDflts(&rmlvo); if (!info->force && (dmxInput->keycodes || dmxInput->symbols || dmxInput->geometry)) { |