[gtk+/multitouch-for-3.4: 84/89] gdk: Don't fully destroy the implicit touch grab on ::grab-broken

[Carlos Garnacho <carlosg src gnome org>]

commit 3f914190b1516336137c157747b0eabbb447c4e5
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Feb 21 03:12:10 2012 +0100

    gdk: Don't fully destroy the implicit touch grab on ::grab-broken
    
    the backing GdkTouchGrabInfo will be needed if the overriding device
    grab finishes before the touch does in order to send events back to
    the implicit grab window. Instead, wait until the touch is physically
    finished before removing the matching GdkTouchGrabInfo

 gdk/gdkdisplay.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index a1f322f..398ccb1 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -702,9 +702,9 @@ _gdk_display_break_touch_grabs (GdkDisplay *display,
                                 GdkDevice  *device,
                                 GdkWindow  *new_grab_window)
 {
-  guint i = 0;
+  guint i;
 
-  while (i < display->touch_implicit_grabs->len)
+  for (i = 0; i < display->touch_implicit_grabs->len; i++)
     {
       GdkTouchGrabInfo *info;
 
@@ -713,14 +713,8 @@ _gdk_display_break_touch_grabs (GdkDisplay *display,
 
       if (info->device == device &&
           info->window != new_grab_window)
-        {
-          generate_grab_broken_event (GDK_WINDOW (info->window),
-                                      device, TRUE, new_grab_window);
-          _gdk_window_finish_touch_id (info->window, device, info->touch_id);
-          g_array_remove_index_fast (display->touch_implicit_grabs, i);
-        }
-      else
-        i++;
+        generate_grab_broken_event (GDK_WINDOW (info->window),
+                                    device, TRUE, new_grab_window);
     }
 }