xserver: Branch 'server-1.6-branch' - 2 commits

[Keith Packard]

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

New commits:
commit 01f0210b2ba34f724aa221bbe6b567a5751781a6
Author: Keith Packard <keithp at keithp.com>
Date:   Fri May 8 22:29:15 2009 -0700

    xserver 1.6.1.901
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 4c4c797..af4ba4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,12 +26,12 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.6.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.6.1.901, [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
 
-RELEASE_DATE="2009-4-14"
+RELEASE_DATE="2009-5-8"
 
 dnl this gets generated by autoheader, and thus contains all the defines.  we
 dnl don't ever actually use it, internally.
commit e21c9949ac456ba9b162b6244a17e68c5b8112a9
Author: Pierre Ossman <pierre at ossman.eu>
Date:   Tue Apr 28 09:34:55 2009 +0200

    dix: fix calculation of number of fake KeyRelease events
    
    Signed-off-by: Pierre Ossman <pierre at ossman.eu>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/getevents.c b/dix/getevents.c
index 279f49e..9747b35 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -820,11 +820,15 @@ GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
         if (noXkbExtension)
 #endif
         {
-            numEvents += GetKeyboardValuatorEvents(events, pDev,
-                                                   KeyRelease, key_code,
-                                                   first_valuator, num_valuators,
-                                                   valuators);
-            events += numEvents;
+            int numReleaseEvents;
+
+            numReleaseEvents = GetKeyboardValuatorEvents(events, pDev,
+                                                         KeyRelease, key_code,
+                                                         first_valuator,
+                                                         num_valuators,
+                                                         valuators);
+            numEvents += numReleaseEvents;
+            events += numReleaseEvents;
         }
     }