From 71f4eaec7713643a7e2d07e27b9afeabd6f1ce02 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Sun, 9 Mar 2008 14:46:56 -0700 Subject: Fix cut-and-paste errors in xkb alternate spellings code Fixes 2b334d6b69d7dde5d553c638e134ebdf974749f3. --- src/evdev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/evdev.c') diff --git a/src/evdev.c b/src/evdev.c index 9f5d160..e53e449 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -679,17 +679,17 @@ EvdevAddKeyClass(DeviceIntPtr device) if (!pEvdev->xkb_rules) SetXkbOption(pInfo, "XkbRules", &pEvdev->xkb_rules); SetXkbOption(pInfo, "xkb_model", &pEvdev->xkb_model); - if (!pEvdev->xkb_rules) - SetXkbOption(pInfo, "XkbModel", &pEvdev->xkb_rules); + if (!pEvdev->xkb_model) + SetXkbOption(pInfo, "XkbModel", &pEvdev->xkb_model); SetXkbOption(pInfo, "xkb_layout", &pEvdev->xkb_layout); - if (!pEvdev->xkb_rules) - SetXkbOption(pInfo, "XkbLayout", &pEvdev->xkb_rules); + if (!pEvdev->xkb_layout) + SetXkbOption(pInfo, "XkbLayout", &pEvdev->xkb_layout); SetXkbOption(pInfo, "xkb_variant", &pEvdev->xkb_variant); - if (!pEvdev->xkb_rules) - SetXkbOption(pInfo, "XkbVariant", &pEvdev->xkb_rules); + if (!pEvdev->xkb_variant) + SetXkbOption(pInfo, "XkbVariant", &pEvdev->xkb_variant); SetXkbOption(pInfo, "xkb_options", &pEvdev->xkb_options); - if (!pEvdev->xkb_rules) - SetXkbOption(pInfo, "XkbOptions", &pEvdev->xkb_rules); + if (!pEvdev->xkb_options) + SetXkbOption(pInfo, "XkbOptions", &pEvdev->xkb_options); if (pEvdev->xkbnames.keymap) pEvdev->xkb_rules = NULL; -- cgit v1.2.3