[gtk+/touch-for-3.4] Remove the GdkEventTouch.button field

[Matthias Clasen <matthiasc src gnome org>]

commit 59e14c5b56a86aa2187013de87e9d8b9eb28afc8
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Feb 24 11:51:52 2012 -0500

    Remove the GdkEventTouch.button field
    
    Touch events don't have a button.

 gdk/gdkevents.h                |    7 +------
 gdk/x11/gdkdevicemanager-xi2.c |    1 -
 2 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index e89cfb6..7ec4f85 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -691,10 +691,6 @@ struct _GdkEventButton
  * @state: (type GdkModifierType): a bit-mask representing the state of
  *   the modifier keys (e.g. Control, Shift and Alt) and the pointer
  *   buttons. See #GdkModifierType.
- * @button: the button which was pressed or released, numbered from 1 to 5.
- *   Normally button 1 is the left mouse button, 2 is the middle button,
- *   and 3 is the right button. On 2-button mice, the middle button can
- *   often be simulated by pressing both mouse buttons together.
  * @device: the device where the event originated.
  * @x_root: the x coordinate of the pointer relative to the root of the
  *   screen.
@@ -716,10 +712,9 @@ struct _GdkEventTouch
   gdouble y;
   gdouble *axes;
   guint state;
-  guint button;
+  guint touch_id;
   GdkDevice *device;
   gdouble x_root, y_root;
-  guint touch_id;
 };
 
 /**
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index ecc6c52..cf1ba15 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -1292,7 +1292,6 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
         if (ev->evtype == XI_TouchBegin)
           event->touch.state |= GDK_BUTTON1_MASK;
 
-        event->touch.button = 1;
         event->touch.touch_id = xev->detail;
 
         if (xev->flags & (XIPointerEmulated | XITouchEmulatingPointer))