From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 16 May 2012 21:18:51 +0000 (-0400)
Subject: Fix a case of 'stuck grab'
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=16458b0de2203a0956c55f21d18e6af916e4c066;p=~andy%2Fgtk

Fix a case of 'stuck grab'

This was showing up when using a combo box in list mode. After popping
up the list, the keyboard grab appeared stuck. What was stuck here is
only the client-side grab, since we forgot to clean up our grabs
when receiving an UnmapNotify.

This bug was introduced in 1c970036648bffd5d58499bb7c8e2439b84d4397.
---

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index fe3784a3e..3ef8fa056 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -659,16 +659,15 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
            * means we hid the window ourselves, so we will have already flipped
            * the iconified bit off.
            */
-          if (window)
-            {
-              if (GDK_WINDOW_IS_MAPPED (window))
-                gdk_synthesize_window_state (window,
-                                             0,
-                                             GDK_WINDOW_STATE_ICONIFIED);
-              _gdk_x11_window_grab_check_unmap (window, xevent->xany.serial);
-            }
+          if (window && GDK_WINDOW_IS_MAPPED (window))
+            gdk_synthesize_window_state (window,
+                                         0,
+                                         GDK_WINDOW_STATE_ICONIFIED);
         }
 
+      if (window)
+        _gdk_x11_window_grab_check_unmap (window, xevent->xany.serial);
+
       break;
 
     case MapNotify: