xserver: Branch 'master'

[Jon TURNEY]

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

New commits:
commit cd8abd17abcc8ae9da6704d03b97a9f134f36aab
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Wed Jun 17 14:17:07 2009 +0100

    Cygwin/X: Fix permuted args to InitPointerDeviceStruct()
    
    Fix a minor error in commit a30fef9956b296f59ea18a9ee38d0abafeb15a4e,
    new btn_labels argument to InitPointerDeviceStruct() wasn't added in
    the right place

diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c
index e6d8913..b537d32 100644
--- a/hw/xwin/winmouse.c
+++ b/hw/xwin/winmouse.c
@@ -113,9 +113,9 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState)
       axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
 
       InitPointerDeviceStruct (pDevice,
-			       btn_labels,
 			       map,
 			       lngMouseButtons + lngWheelEvents,
+			       btn_labels,
 			       winMouseCtrl,
 			       GetMotionHistorySize(),
 			       2,