[gtk+/gtk-3-12] combobox: Fix reentrancy in gtk_combo_box_popdown()

[Carlos Garnacho <carlosg src gnome org>]

commit d6c1a6280d46b3bf51af831cc3a9e4436256accd
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Jun 5 21:09:46 2014 +0200

    combobox: Fix reentrancy in gtk_combo_box_popdown()
    
    If called when already popped down, warnings would be issued due
    to priv->grab_pointer being unexpectedly NULL, this would happen
    in regular operation when selecting items in appears-as-list mode.
    
    So both add a NULL check for priv->grab_pointer, and bail out early
    if the popup window is already hidden.

 gtk/gtkcombobox.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 10b6575..0a175dd 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2548,9 +2548,13 @@ gtk_combo_box_popdown (GtkComboBox *combo_box)
   if (!gtk_widget_get_realized (GTK_WIDGET (combo_box)))
     return;
 
+  if (!gtk_widget_is_drawable (priv->popup_window))
+    return;
+
   if (priv->grab_keyboard)
     gdk_device_ungrab (priv->grab_keyboard, GDK_CURRENT_TIME);
-  gdk_device_ungrab (priv->grab_pointer, GDK_CURRENT_TIME);
+  if (priv->grab_pointer)
+    gdk_device_ungrab (priv->grab_pointer, GDK_CURRENT_TIME);
 
   gtk_device_grab_remove (priv->popup_window, priv->grab_pointer);
   gtk_widget_hide (priv->popup_window);