[gtk+/gtk-3-22] Revert "Revert "combobox: remove superfluous GTK+ grabs""

[Daniel Boles <dboles src gnome org>]

commit b92234be08d1575aeb6957be656a09f1e4f624c2
Author: Daniel Boles <dboles src gnome org>
Date:   Wed Oct 4 21:08:09 2017 +0100

    Revert "Revert "combobox: remove superfluous GTK+ grabs""
    
    This reverts commit 13017239055dc492f7e5cdeae63f01e6e820da4e.
    
    This only appeared to fix the two bugs it linked because, rather than
    being superfluous, the GTK+ grabs resulted in effectively having *none*,
    or something, and could cause a critical when closing during a scroll.
    
    This also reverts commit b9989e554b3ccd122b1726f2b7d128638c3b5ca4, which
    depended on the above.
    
    See next commit, which *should* properly fix what this one claimed to…
    
    https://bugzilla.gnome.org/show_bug.cgi?id=787274

 gtk/gtkcombobox.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 4c3682a..92fc768 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2360,7 +2360,6 @@ gtk_combo_box_popup_for_device (GtkComboBox *combo_box,
       return;
     }
 
-  gtk_device_grab_add (priv->popup_window, pointer, TRUE);
   priv->grab_pointer = pointer;
 
   g_signal_connect (priv->popup_window,
@@ -2433,10 +2432,7 @@ gtk_combo_box_popdown (GtkComboBox *combo_box)
     return;
 
   if (priv->grab_pointer)
-    {
-      gdk_seat_ungrab (gdk_device_get_seat (priv->grab_pointer));
-      gtk_device_grab_remove (priv->popup_window, priv->grab_pointer);
-    }
+    gdk_seat_ungrab (gdk_device_get_seat (priv->grab_pointer));
 
   gtk_widget_hide (priv->popup_window);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->button),