From 08e9c93b17d767e932df8d112cafd0fd1d96e282 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 6 Mar 2014 20:38:11 +0100 Subject: [PATCH] popover: Only give back focus to drawable widgets If the previous focus widget is not drawable anymore, don't even bother in transmitting the focus grab to it. --- gtk/gtkpopover.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index 8e1c56b064..1cc9e9c5d4 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -275,10 +275,12 @@ gtk_popover_apply_modality (GtkPopover *popover, { gtk_grab_remove (GTK_WIDGET (popover)); - /* Let prev_focus_widget regain focus */ if (priv->prev_focus_widget) { - gtk_widget_grab_focus (priv->prev_focus_widget); + /* Let prev_focus_widget regain focus */ + if (gtk_widget_is_drawable (priv->prev_focus_widget)) + gtk_widget_grab_focus (priv->prev_focus_widget); + g_object_unref (priv->prev_focus_widget); priv->prev_focus_widget = NULL; }