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

src/draglock.c

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

src/emuMB.c

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

src/emuWheel.c

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

src/evdev.c

@@ -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);