Register property handler from within the modules, not the main evdev file.

This commit is contained in:
Peter Hutterer
2008-10-14 16:12:13 +10:30
parent b0737bdbd1
commit cefedeb205
4 changed files with 6 additions and 3 deletions

View File

@@ -246,6 +246,8 @@ EvdevDragLockInitProperty(DeviceIntPtr dev)
XISetDevicePropertyDeletable(dev, prop_dlock, FALSE);
XIRegisterPropertyHandler(dev, EvdevDragLockSetProperty, NULL, NULL);
return;
}

View File

@@ -373,6 +373,8 @@ EvdevMBEmuInitProperty(DeviceIntPtr dev)
if (rc != Success)
return;
XISetDevicePropertyDeletable(dev, prop_mbtimeout, FALSE);
XIRegisterPropertyHandler(dev, EvdevMBEmuSetProperty, NULL, NULL);
}
int

View File

@@ -371,6 +371,8 @@ EvdevWheelEmuInitProperty(DeviceIntPtr dev)
return;
XISetDevicePropertyDeletable(dev, prop_wheel_button, FALSE);
XIRegisterPropertyHandler(dev, EvdevWheelEmuSetProperty, NULL, NULL);
}

View File

@@ -950,9 +950,6 @@ EvdevInit(DeviceIntPtr device)
/* We drop the return value, the only time we ever want the handlers to
* unregister is when the device dies. In which case we don't have to
* unregister anyway */
XIRegisterPropertyHandler(device, EvdevMBEmuSetProperty, NULL, NULL);
XIRegisterPropertyHandler(device, EvdevWheelEmuSetProperty, NULL, NULL);
XIRegisterPropertyHandler(device, EvdevDragLockSetProperty, NULL, NULL);
XIRegisterPropertyHandler(device, EvdevSetProperty, NULL, NULL);
EvdevInitProperty(device);
EvdevMBEmuInitProperty(device);