[gtk+/touch-for-3.4: 51/65] xi2: Mark touch events emulating the pointer as such

[Matthias Clasen <matthiasc src gnome org>]

commit 127c0c213d568e8ed3b9b58e5c1f6723b1c65c7b
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Jan 5 00:58:48 2012 +0100

    xi2: Mark touch events emulating the pointer as such

 gdk/x11/gdkdevicemanager-xi2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 31250c1..ef4581d 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -1206,7 +1206,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
               event->button.button = xev->detail;
           }
 
-        if (xev->flags & XIPointerEmulated)
+        if (xev->flags & (XIPointerEmulated | XITouchEmulatingPointer))
           _gdk_event_set_pointer_emulated (event, TRUE);
 
         if (return_val == FALSE)
@@ -1264,7 +1264,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
 	if (ev->evtype == XI_TouchUpdate)
           event->motion.state |= GDK_BUTTON1_MASK;
 
-        if (xev->flags & XIPointerEmulated)
+        if (xev->flags & (XIPointerEmulated | XITouchEmulatingPointer))
           _gdk_event_set_pointer_emulated (event, TRUE);
 
         /* There doesn't seem to be motion hints in XI */