diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-28 12:59:46 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-28 12:59:46 +0000 |
| commit | 3015123fd2904d907896b1aefbe32c267baa2dc2 (patch) | |
| tree | 3adc12a65779305c5fb676be577667ff7e33c389 /xorg-server/hw/kdrive/src/kinput.c | |
| parent | 0d9293f57738117231d77df831b6569d4f0739f2 (diff) | |
| parent | 0b9b391c5a7acb31e5d8061169649043a38d6d0e (diff) | |
| download | vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.tar.gz vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.tar.bz2 vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/kdrive/src/kinput.c')
| -rw-r--r-- | xorg-server/hw/kdrive/src/kinput.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c index ee8fba65a..2ae0a201e 100644 --- a/xorg-server/hw/kdrive/src/kinput.c +++ b/xorg-server/hw/kdrive/src/kinput.c @@ -497,7 +497,6 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff) free(axes_labels);
if (pi->inputClass == KD_TOUCHSCREEN) {
- InitAbsoluteClassDeviceStruct(pDevice);
xiclass = AtomFromName(XI_TOUCHSCREEN);
}
else {
@@ -2229,8 +2228,6 @@ ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev, case DEVICE_ABS_CALIB:
case DEVICE_ABS_AREA:
- return Success;
-
case DEVICE_CORE:
return BadMatch;
case DEVICE_ENABLE:
|