Bug 555676 – gtk_widget_real_grab_focus assumes toplevel == window

* gtk/gtkwidget.c (gtk_widget_real_grab_focus):
Actually test for GTK_IS_WINDOW *and* GTK_WIDGET_TOPLEVEL

svn path=/trunk/; revision=21631

diff --git a/ChangeLog b/ChangeLog
index 859d0ef78b456ecd04fcdcf1daca05cd6fdb8491..a9905f847c0cc4506e6a052f0b6511fcd2b17fd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-11  Christian Dywan  <christian@imendio.com>
+
+       Bug 555676 – gtk_widget_real_grab_focus assumes toplevel == window
+
+       * gtk/gtkwidget.c (gtk_widget_real_grab_focus):
+        Actually test for GTK_IS_WINDOW *and* GTK_WIDGET_TOPLEVEL
+
 2008-10-10  Behdad Esfahbod  <behdad@gnome.org>
 
        Bug 551355 – [PATCH] Make glib build with libtool 2.2

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index f5b2fd18cc08ff0a702d4410dd44326c2bd4dbfa..1905c41734095098d5870916dd643f5c0e958d8d 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5096,7 +5096,7 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget)
        * be set by the next loop.
        */
       toplevel = gtk_widget_get_toplevel (focus_widget);
-      if (GTK_IS_WINDOW (toplevel))
+      if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel))
        {
          widget = GTK_WINDOW (toplevel)->focus_widget;