diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-14 16:57:29 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-17 10:03:40 +1000 |
| commit | b406886bbffadaa52864a99f2a0520999eadc15d (patch) | |
| tree | 815537f8c64b5de361d9232b537f9e62c2f4b865 /dix/devices.c | |
| parent | 4e4e263bc073bf452f19c932b937c4881ae71f64 (diff) | |
input: allow NULL as XkbRMVLOSet in InitKeyboardDeviceStruct.
Virtually all callers use
XkbGetRulesDefault(&rmlvo);
InitKeyboardDeviceStruct(..., rmlvo);
Let's save them the trouble and accept NULL as a hint to take the
default RMLVO.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'dix/devices.c')
| -rw-r--r-- | dix/devices.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/dix/devices.c b/dix/devices.c index b9d1c85a5..d14eddd72 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -471,12 +471,10 @@ CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl) static int CoreKeyboardProc(DeviceIntPtr pDev, int what) { - XkbRMLVOSet rmlvo; switch (what) { case DEVICE_INIT: - XkbGetRulesDflts(&rmlvo); - if (!InitKeyboardDeviceStruct(pDev, &rmlvo, CoreKeyboardBell, + if (!InitKeyboardDeviceStruct(pDev, NULL, CoreKeyboardBell, CoreKeyboardCtl)) { ErrorF("Keyboard initialization failed. This could be a missing " |