diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 10 |
2 files changed, 13 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2005-02-26 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/mozilla-embed-single.cpp: + + Don't assert if we don't have a new embed in new_window callback. + Part of bug #165445. + +2005-02-26 Christian Persch <chpe@cvs.gnome.org> + * src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_folder): Make sure folder is != NULL. Fixes bug #163341. diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index 961aced31..4d34511bf 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -334,11 +334,13 @@ mozilla_embed_single_new_window_orphan_cb (GtkMozEmbedSingle *moz_single, g_signal_emit_by_name (single, "new-window", NULL, mask, &new_embed); - g_assert (new_embed != NULL); - - gtk_moz_embed_set_chrome_mask (GTK_MOZ_EMBED (new_embed), chrome); + /* it's okay not to have a new embed */ + if (new_embed != NULL) + { + gtk_moz_embed_set_chrome_mask (GTK_MOZ_EMBED (new_embed), chrome); - *newEmbed = GTK_MOZ_EMBED (new_embed); + *newEmbed = GTK_MOZ_EMBED (new_embed); + } } static void |