[gtk+/touch-for-3.4] Don't treat touch events as button events

[Matthias Clasen <matthiasc src gnome org>]

commit c2b7789ef56581c70267c7ae9c239b3ac13d3249
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Feb 26 00:04:39 2012 -0500

    Don't treat touch events as button events
    
    One more place where we assumed that touch events have a button
    field.

 gdk/gdkwindow.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index d9516ea..51b7e76 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -9977,10 +9977,11 @@ _gdk_windowing_got_event (GdkDisplay *display,
       gdk_event_get_state (event, &pointer_info->state);
 
       if (event->type == GDK_BUTTON_PRESS ||
-          event->type == GDK_BUTTON_RELEASE ||
-          event->type == GDK_TOUCH_BEGIN ||
-          event->type == GDK_TOUCH_END)
+          event->type == GDK_BUTTON_RELEASE)
         pointer_info->button = event->button.button;
+      else if (event->type == GDK_TOUCH_BEGIN ||
+               event->type == GDK_TOUCH_END)
+        pointer_info->button = 1;
 
       if (device &&
           (pointer_info->state != old_state ||