configure.ac | 2 +- src/evdev.c | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-)
New commits: commit 30c3645e20e945b0f8b7dc624748948464be606e Author: Peter Hutterer <[email protected]> Date: Tue Jan 11 12:46:40 2011 +1000 evdev 2.6.0 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 44d5976..887021c 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-evdev], - [2.5.99.903], + [2.6.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-input-evdev]) AC_CONFIG_SRCDIR([Makefile.am]) commit 3b52fe2ea4a934a8d87aacd185593beb01f8f273 Author: Chase Douglas <[email protected]> Date: Wed Jan 5 10:09:55 2011 -0500 Print out error messages when failing to init devices Signed-off-by: Chase Douglas <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> diff --git a/src/evdev.c b/src/evdev.c index d47b6c2..45873c1 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1320,8 +1320,11 @@ EvdevAddAbsClass(DeviceIntPtr device) #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 GetMotionHistory, #endif - GetMotionHistorySize(), Absolute)) + GetMotionHistorySize(), Absolute)) { + xf86Msg(X_ERROR, "%s: failed to initialize valuator class device.\n", + device->name); return !Success; + } for (axis = ABS_X; axis <= ABS_MAX; axis++) { int axnum = pEvdev->axis_map[axis]; @@ -1365,8 +1368,11 @@ EvdevAddAbsClass(DeviceIntPtr device) } } - if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) + if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) { + xf86Msg(X_ERROR, "%s: failed to initialize pointer feedback class " + "device.\n", device->name); return !Success; + } if (pEvdev->flags & EVDEV_TOUCHPAD) pEvdev->flags |= EVDEV_RELATIVE_MODE; @@ -1449,11 +1455,17 @@ EvdevAddRelClass(DeviceIntPtr device) #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 GetMotionHistory, #endif - GetMotionHistorySize(), Relative)) + GetMotionHistorySize(), Relative)) { + xf86Msg(X_ERROR, "%s: failed to initialize valuator class device.\n", + device->name); return !Success; + } - if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) + if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) { + xf86Msg(X_ERROR, "%s: failed to initialize pointer feedback class " + "device.\n", device->name); return !Success; + } for (axis = REL_X; axis <= REL_MAX; axis++) { -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
