summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-02-22 20:53:46 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-02-25 14:50:48 +1000
commitb3412adca8b2ba3fff348bceb4f01b9e968c0afc (patch)
tree3b873ad25e392145334cbdf4ba661c04c4102158 /Xi
parenta180c2367974abe2ccdc88bb5c6f138c7df4d2e9 (diff)
Xi: don't need to set the XKB settings for new core devices.
This is done by the XKB code these days anyway, so we might as well ignore it and keep using the stanard stuff. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xi')
-rw-r--r--Xi/chdevhier.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/Xi/chdevhier.c b/Xi/chdevhier.c
index 154a402e0..9a8582916 100644
--- a/Xi/chdevhier.c
+++ b/Xi/chdevhier.c
@@ -102,7 +102,6 @@ ProcXChangeDeviceHierarchy(ClientPtr client)
{
xCreateMasterInfo* c = (xCreateMasterInfo*)any;
char* name;
- XkbRMLVOSet set;
SWAPIF(swaps(&c->namelen, n));
name = xcalloc(c->namelen + 1, sizeof(char));
@@ -119,15 +118,6 @@ ProcXChangeDeviceHierarchy(ClientPtr client)
if (!c->sendCore)
ptr->coreEvents = keybd->coreEvents = FALSE;
- /* supplying NULL for rules simply means we re-use
- whatever ruleset we used for the previous devices. */
- set.rules = NULL;
- set.model = "pc105";
- set.layout = "us";
- set.variant = NULL;
- set.options = NULL;
- XkbSetRulesDflts(&set);
-
ActivateDevice(ptr);
ActivateDevice(keybd);