diff options
author | marha <marha@users.sourceforge.net> | 2013-10-21 07:48:16 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-10-21 07:48:16 +0200 |
commit | c665b6e88274f8bc603b0f14f92bf09d2023bd4d (patch) | |
tree | e6b3c81a76d0cc2df868263aeae0ab045eaf45b4 /xorg-server/dix/window.c | |
parent | 91e353434f0a6859f404be05581f44d009ca5d6c (diff) | |
parent | 6d895f30ab93d71afddc612d8b007f2de7f04165 (diff) | |
download | vcxsrv-c665b6e88274f8bc603b0f14f92bf09d2023bd4d.tar.gz vcxsrv-c665b6e88274f8bc603b0f14f92bf09d2023bd4d.tar.bz2 vcxsrv-c665b6e88274f8bc603b0f14f92bf09d2023bd4d.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver xkeyboard-config git update 21 okt 2013
Diffstat (limited to 'xorg-server/dix/window.c')
-rw-r--r-- | xorg-server/dix/window.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c index 804b54c32..112417ebf 100644 --- a/xorg-server/dix/window.c +++ b/xorg-server/dix/window.c @@ -3092,9 +3092,7 @@ dixSaveScreens(ClientPtr client, int on, int mode) DeviceIntPtr dev; UpdateCurrentTimeIf(); nt_list_for_each_entry(dev, inputInfo.devices, next) - lastDeviceEventTime[dev->id] = currentTime; - lastDeviceEventTime[XIAllDevices] = currentTime; - lastDeviceEventTime[XIAllMasterDevices] = currentTime; + NoticeTime(dev, currentTime); } SetScreenSaverTimer(); } |