aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/EphyUtils.cpp5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5374daead..11a738819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-06 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/EphyUtils.cpp:
+
+ Check that 'toplevel' with GTK_WIDGET_TOPLEVEL.
+
2005-10-03 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp
index 12d49460e..981162428 100644
--- a/embed/mozilla/EphyUtils.cpp
+++ b/embed/mozilla/EphyUtils.cpp
@@ -122,7 +122,10 @@ EphyUtils::FindGtkParent (nsIDOMWindow *aDOMWindow)
GtkWidget *embed = FindEmbed (aDOMWindow);
NS_ENSURE_TRUE (embed, nsnull);
- return gtk_widget_get_toplevel (GTK_WIDGET (embed));
+ GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (embed));
+ if (!GTK_WIDGET_TOPLEVEL (toplevel)) return nsnull;
+
+ return toplevel;
}
nsresult