From e7c950c6273ff93f25c091c93d86da6e332a2277 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 4 Aug 2009 15:15:24 +1000
Subject: [PATCH] dmx: fix a call to XkbSetRulesDflts, takes XkbRMLVOSet now.

---
 hw/dmx/input/dmxinputinit.c | 13 ++++++++-----
 1 file 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)) {