Merge commit '6ea59dc2'

604169af · Keith Packard · 8f4640bd · 6ea59dc2 · 604169af
Commit 604169af authored Mar 04, 2013 by Keith Packard
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Xi/xibarriers.c Xi/xibarriers.c +2 -2

No files found.
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -676,8 +676,8 @@ BarrierFreeBarrier(void *data, XID id)
            continue;

        ev.deviceid = dev->id;
-        ev.event_id = pbd->barrier_event_id,
-        ev.dt = ms - pbd->last_timestamp,
+        ev.event_id = pbd->barrier_event_id;
+        ev.dt = ms - pbd->last_timestamp;

        GetSpritePosition(dev, &root_x, &root_y);
        ev.root_x = root_x;