xserver: Branch 'master' - 3 commits

[Peter Hutterer]

 dix/window.c                   |    1 +
 hw/xfree86/common/xf86Xinput.c |    2 +-
 xkb/xkbAccessX.c               |    3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a4cb25f8c816adc3bdf6a28d5beb558e8be40121
Author: Ben Gamari <bgamari at gmail.com>
Date:   Tue Jun 24 12:08:35 2008 +0930

    dix: free FocusPrivates when deleting a window. #16493
    
    Signed-off-by: Peter Hutterer <peter at cs.unisa.edu.au>
    
    X.Org Bug 16493 <http://bugs.freedesktop.org/show_bug.cgi?id=16493>

diff --git a/dix/window.c b/dix/window.c
index 6b95068..137afa0 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -978,6 +978,7 @@ DeleteWindow(pointer value, XID wid)
 	if (pWin->prevSib)
 	    pWin->prevSib->nextSib = pWin->nextSib;
     }
+    xfree(dixLookupPrivate(&pWin->devPrivates, FocusPrivatesKey));
     dixFreePrivates(pWin->devPrivates);
     xfree(pWin);
     return Success;
commit 32a7bbbba6fec0535a8faa1d6d2ecebe786bcc81
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Tue Jun 24 09:28:05 2008 +0930

    xfree86: fix up leftover allocation of xf86Events.
    
    Thanks to Eamon Walsh for spotting this.

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 675ec9f..b98e903 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -131,7 +131,7 @@ xf86ProcessCommonOptions(LocalDevicePtr local,
     local->history_size = GetMotionHistorySize();
     /* Preallocate xEvent store */
     if (!xf86Events)
-        xf86Events = (xEvent *)xcalloc(sizeof(xEvent), GetMaximumEventsNum());
+        GetEventList(&xf86Events);
     if (!xf86Events)
         FatalError("Couldn't allocate event store\n");
 }
commit bcc88a1d46c7ba469c4e2861875f84f8c77d4b15
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Sun Jun 22 22:34:30 2008 +0930

    xkb: remove unused variable is_core.

diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 28107d0..d3b585a 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -309,15 +309,14 @@ AccessXRepeatKeyExpire(OsTimerPtr timer,CARD32 now,pointer arg)
 DeviceIntPtr    dev = (DeviceIntPtr) arg;
 XkbSrvInfoPtr	xkbi = dev->key->xkbInfo;
 KeyCode		key;
-BOOL            is_core;
 
     if (xkbi->repeatKey == 0)
 	return 0;
 
-    is_core = (dev == inputInfo.keyboard);
     key = xkbi->repeatKey;
     AccessXKeyboardEvent(dev, DeviceKeyRelease, key, True);
     AccessXKeyboardEvent(dev, DeviceKeyPress, key, True);
+
     return xkbi->desc->ctrls->repeat_interval;
 }