[gtk+] popover: Do not hide the popover if the focus widget is just unset

[Carlos Garnacho <carlosg src gnome org>]

commit e2cd59b7313a28f74104f8f9c49412042578c7bf
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon May 19 13:41:34 2014 +0200

    popover: Do not hide the popover if the focus widget is just unset
    
    The focus widget might be unset, just to be set again on a widget inside
    the popover. Have the popover wait till the focus is actually moved outside
    before dismissing.

 gtk/gtkpopover.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 7210622..8e6059e 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -341,9 +341,9 @@ window_set_focus (GtkWindow  *window,
 {
   GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
 
-  if (priv->modal &&
+  if (priv->modal && widget &&
       gtk_widget_is_drawable (GTK_WIDGET (popover)) &&
-      (!widget || !gtk_widget_is_ancestor (widget, GTK_WIDGET (popover))))
+      !gtk_widget_is_ancestor (widget, GTK_WIDGET (popover)))
     gtk_widget_hide (GTK_WIDGET (popover));
 }