xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xwin/winmouse.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3085b178626c957854385c7a88a05ec3c7eb74f3
Merge: c9d89ce... 3c45b59...
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Apr 6 08:34:10 2011 -0700

    Merge remote-tracking branch 'jturney/master'

commit 3c45b59e675ba926ec95842ac3d49e2091e41eb8
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Fri Mar 18 15:00:14 2011 +0000

    Fix XWin compilation after commit 769531b9
    
    commit 769531b9 "Add mode field to pointer movement hooks" changes the
    function signature of miPointerSetPosition() to include the movement mode
    which resulted in the pointer position
    
    Update use of miPointerSetPosition() in winEnqueueMotion() appropriately
    
    (See http://tinderbox.freedesktop.org/builds/2011-03-16-0008/logs/xserver/#build)
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c
index ee93d8f..080e096 100644
--- a/hw/xwin/winmouse.c
+++ b/hw/xwin/winmouse.c
@@ -372,7 +372,7 @@ void winEnqueueMotion(int x, int y)
   ValuatorMask mask;
   EventListPtr events;
 
-  miPointerSetPosition(g_pwinPointer, &x, &y);
+  miPointerSetPosition(g_pwinPointer, POINTER_RELATIVE, &x, &y);
   valuators[0] = x;
   valuators[1] = y;