diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-03-22 13:13:07 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-03-22 13:13:07 +1000 |
| commit | a7eac500e652f30deffd9dc5e623fab701077738 (patch) | |
| tree | 4752399bd0658a63f8d1af3b3f9ceb6bf039721c /os | |
| parent | bf876c87a9099fdfa63ed599f8ed9a954dd023d9 (diff) | |
| parent | d645edd11e7482f98c8b7e0d6c8693285c484907 (diff) | |
Merge branch 'per-device-sync-counters' into for-keith
Diffstat (limited to 'os')
| -rw-r--r-- | os/WaitFor.c | 2 | ||||
| -rw-r--r-- | os/xdmcp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/os/WaitFor.c b/os/WaitFor.c index 4c3be343b..95e64ba45 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -547,7 +547,7 @@ NextDPMSTimeout(INT32 timeout) static CARD32 ScreenSaverTimeoutExpire(OsTimerPtr timer, CARD32 now, pointer arg) { - INT32 timeout = now - lastDeviceEventTime.milliseconds; + INT32 timeout = now - lastDeviceEventTime[XIAllDevices].milliseconds; CARD32 nextTimeout = 0; #ifdef DPMSExtension diff --git a/os/xdmcp.c b/os/xdmcp.c index 8d0fbb5a9..87f04b455 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -1391,7 +1391,7 @@ recv_alive_msg(unsigned length) if (SessionRunning && AliveSessionID == SessionID) { /* backoff dormancy period */ state = XDM_RUN_SESSION; - if ((GetTimeInMillis() - lastDeviceEventTime.milliseconds) > + if ((GetTimeInMillis() - lastDeviceEventTime[XIAllDevices].milliseconds) > keepaliveDormancy * 1000) { keepaliveDormancy <<= 1; if (keepaliveDormancy > XDM_MAX_DORMANCY) |