xserver: Branch 'master'

[Peter Hutterer]

 hw/xnest/Keyboard.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit bef1cfb2395df47458159a0b7ae27b9db15025ef
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Apr 14 16:54:42 2009 +1000

    xnest: remove unused variable 'names'.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index c9b4a17..8404c8b 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -120,7 +120,6 @@ xnestKeyboardProc(DeviceIntPtr pDev, int onoff)
   KeySymsRec keySyms;
   int i;
   XKeyboardState values;
-  XkbComponentNamesRec names;
   XkbDescPtr xkb;
   XkbRMLVOSet rmlvo;
   int op, event, error, major, minor;
@@ -166,7 +165,6 @@ xnestKeyboardProc(DeviceIntPtr pDev, int onoff)
       }
       XkbGetControls(xnestDisplay, XkbAllControlsMask, xkb);
 
-      memset(&names, 0, sizeof(XkbComponentNamesRec));
       rmlvo.rules = XKB_DFLT_RULES;
       rmlvo.model = XKB_DFLT_MODEL;
       rmlvo.layout = XKB_DFLT_LAYOUT;