xserver: Branch 'master'

[Peter Hutterer]

 xkb/xkbInit.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6559f02ef89cb0ee365110d6a928ebd29632ad53
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Fri Apr 17 15:14:45 2009 +0100

    xkb: set bell_func in InitKeyboardDeviceStruct.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 5ac06fe..7c611bc 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;