summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-08-24 13:46:35 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-09-27 09:41:44 +0200
commit5a29cb126de577a2a0a41e10d9af13091a73d334 (patch)
tree1df2b68d56539b79953e98477628be89579d3653
parent72e3e6f4a7690f70a6b5f7689633cdea859535e1 (diff)
dix: don't set time to CurrentTime in DeviceChangedEvents.
CurrentTime is used by clients to skip setting the time, but not by the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 86560b5d05f14bdf04d21b3457a66c0d5045db9c)
-rw-r--r--dix/devices.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/devices.c b/dix/devices.c
index 0bd9b75e6..9aaadc494 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2347,7 +2347,7 @@ RecalculateMasterButtons(DeviceIntPtr slave)
event.header = ET_Internal;
event.type = ET_DeviceChanged;
- event.time = CurrentTime;
+ event.time = GetTimeInMillis();
event.deviceid = master->id;
event.flags = DEVCHANGE_POINTER_EVENT | DEVCHANGE_DEVICE_CHANGE;
event.buttons.num_buttons = maxbuttons;