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

(cherry picked from commit cefedeb205291001e7e47b7516de261dbccce059)

4 files changed, 6 insertions, 3 deletions

diff --git a/src/draglock.c b/src/draglock.c
index 86142b6..894aa8a 100644
--- a/src/draglock.c
+++ b/src/draglock.c
@@ -246,6 +246,8 @@ EvdevDragLockInitProperty(DeviceIntPtr dev)
 
     XISetDevicePropertyDeletable(dev, prop_dlock, FALSE);
 
+    XIRegisterPropertyHandler(dev, EvdevDragLockSetProperty, NULL, NULL);
+
     return;
 }
 
diff --git a/src/emuMB.c b/src/emuMB.c
index 363de7e..8e8e2ac 100644
--- a/src/emuMB.c
+++ b/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
diff --git a/src/emuWheel.c b/src/emuWheel.c
index e73ddf3..b9c9e13 100644
--- a/src/emuWheel.c
+++ b/src/emuWheel.c
@@ -371,6 +371,8 @@ EvdevWheelEmuInitProperty(DeviceIntPtr dev)
         return;
 
     XISetDevicePropertyDeletable(dev, prop_wheel_button, FALSE);
+
+    XIRegisterPropertyHandler(dev, EvdevWheelEmuSetProperty, NULL, NULL);
 }
 
 
diff --git a/src/evdev.c b/src/evdev.c
index 6d05b07..b1470a3 100644
--- a/src/evdev.c
+++ b/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);