xserver: Branch 'xorg-server-1.4-apple' - 3 commits

[Jeremy Huddleston]

 configure.ac    |    2 +-
 dix/getevents.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d3cd7b4ed270c12008a3e158cb83d2ffbf5f4a32
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Jun 4 12:21:28 2008 -0700

    1.4.0-apple14

diff --git a/configure.ac b/configure.ac
index 8e357fa..92b1187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.0-apple13, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.0-apple14, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit c407bae5b82e8edceeb8026bd9eac85b8c7fd1bc
Merge: 7812a8b... 7982aaa...
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Jun 4 12:20:35 2008 -0700

    Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple

commit 7982aaa7f071f9a21ad402da872d5328bd7e51ff
Author: Sascha Hlusiak <saschahlusiak at arcor.de>
Date:   Fri May 30 19:30:06 2008 +0200

    Fix getValuatorEvents to compute number of valuators correctly.

diff --git a/dix/getevents.c b/dix/getevents.c
index d0fe2db..c96ee68 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -347,7 +347,7 @@ getValuatorEvents(xEvent *events, DeviceIntPtr pDev, int first_valuator,
     for (i = first_valuator; i < final_valuator; i += 6, xv++, events++) {
         xv->type = DeviceValuator;
         xv->first_valuator = i;
-        xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators - i);
+        xv->num_valuators = ((final_valuator - i) > 6) ? 6 : (final_valuator - i);
         xv->deviceid = pDev->id;
         switch (final_valuator - i) {
         case 6: