diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-24 16:15:47 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-24 16:15:47 +1000 |
| commit | 057fc9a4f89282e440b5e11458f1dd8655879dd8 (patch) | |
| tree | 241de5500f7b467292fb521434a1de1d064ff2bc /xkb | |
| parent | 95628b797e2b326ae15406df4f736e25f5d2f12f (diff) | |
| parent | 932d6bcbb68194c5bdfeb336f700dc8b31529223 (diff) | |
Merge branch 'master' into xi2
Conflicts:
Xi/chdevhier.c
include/input.h
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/xkbInit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 5ac06feae..7c611bcc7 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -594,6 +594,7 @@ InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet *rmlvo, InitFocusClassDeviceStruct(dev); xkbi->kbdProc = ctrl_func; + dev->kbdfeed->BellProc = bell_func; dev->kbdfeed->CtrlProc = XkbDDXKeybdCtrlProc; dev->kbdfeed->ctrl = defaultKeyboardControl; |