xserver: Branch 'master'

[Keith Packard]

 dix/events.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit fa62ca68ef8be7f63cd0b899dfae3366ca9350cf
Author: Rui Matos <tiagomatos at gmail.com>
Date:   Sat Apr 25 21:19:25 2015 +0200

    dix/events: Set currentTime to the given time stamp in NoticeTime
    
    The refactoring in commit efc1035ca958f2c9d266338a308518a0834b1773
    removed the actual update of currentTime.
    
    Signed-off-by: Rui Matos <tiagomatos at gmail.com>
    Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/events.c b/dix/events.c
index 7d2bb6b..efaf91d 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1057,6 +1057,7 @@ MonthChangedOrBadTime(CARD32 *ms)
 void
 NoticeTime(const DeviceIntPtr dev, TimeStamp time)
 {
+    currentTime = time;
     lastDeviceEventTime[XIAllDevices].time = currentTime;
     lastDeviceEventTime[dev->id].time = currentTime;