xserver: Branch 'master'

[Fredrik Höglund]

 Xext/sync.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

New commits:
diff-tree 0f9e89b4e309e570d7d366489d250ca2143f0ad7 (from 6a195e816b9d60f728d77cc1c23538e7af00a879)
Author: Fredrik Höglund <fredrik at kde.org>
Date:   Tue Aug 14 22:47:49 2007 +0200

    Fix the value comparisons in the IDLETIME wakeup handler.
    
    LessThan/GreaterThan comparisons were used in the wakeup handler,
    and LessOrEqual/GreaterOrEqual in the block handler.
    
    Change it to use LessOrEqual/GreaterOrEqual in both functions,
    since this is what XSyncNegativeComparison and
    XSyncPositiveComparison imply.

diff --git a/Xext/sync.c b/Xext/sync.c
index 6fc2dcc..d9b6a9f 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -2592,8 +2592,9 @@ IdleTimeWakeupHandler (pointer env,
     IdleTimeQueryValue (NULL, &idle);
 
     if ((pIdleTimeValueGreater &&
-         XSyncValueGreaterThan (idle, *pIdleTimeValueGreater)) ||
-        (pIdleTimeValueLess && XSyncValueLessThan (idle, *pIdleTimeValueLess)))
+         XSyncValueGreaterOrEqual (idle, *pIdleTimeValueGreater)) ||
+        (pIdleTimeValueLess &&
+	 XSyncValueLessOrEqual (idle, *pIdleTimeValueLess)))
     {
 	SyncChangeCounter (IdleTimeCounter, idle);
     }