[clutter/clutter-1.10] x11/device-manager-xi2: Fix assertions with touch

[Bastien Nocera <hadess src gnome org>]

commit 305632783e7b236323e6c3c713a3a86461795e86
Author: Bastien Nocera <hadess hadess net>
Date:   Thu May 3 18:58:12 2012 +0200

    x11/device-manager-xi2: Fix assertions with touch
    
    When getting touch events, the device manager would try
    to pass an invalid device to translate_axes().
    
    clutter_event_set_device() will only update event->touch.device
    for touch events, not event->motion.device, as used.
    
    Fixes Totem crashing on mouse motion/button press when using
    a touchpad.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=675371

 clutter/x11/clutter-device-manager-xi2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
index 5ac42c8..3356bd1 100644
--- a/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/x11/clutter-device-manager-xi2.c
@@ -1044,7 +1044,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
                                       GINT_TO_POINTER (xev->deviceid));
         clutter_event_set_device (event, device);
 
-        event->touch.axes = translate_axes (event->motion.device,
+        event->touch.axes = translate_axes (event->touch.device,
                                             event->motion.x,
                                             event->motion.y,
                                             stage_x11,
@@ -1097,7 +1097,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
                                       GINT_TO_POINTER (xev->deviceid));
         clutter_event_set_device (event, device);
 
-        event->touch.axes = translate_axes (event->motion.device,
+        event->touch.axes = translate_axes (event->touch.device,
                                             event->motion.x,
                                             event->motion.y,
                                             stage_x11,