aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-02-27 06:48:16 +0800
committerChristian Persch <chpe@src.gnome.org>2005-02-27 06:48:16 +0800
commit6a524f7dfb9b8e4d4f3c4f0c0ef6bd1ce062b504 (patch)
tree5911933d374b6fcc403bb6835d877175dfaf3aa6
parent74aefa193695d7b6333703ec8539d05022c866a3 (diff)
downloadgsoc2013-epiphany-6a524f7dfb9b8e4d4f3c4f0c0ef6bd1ce062b504.tar
gsoc2013-epiphany-6a524f7dfb9b8e4d4f3c4f0c0ef6bd1ce062b504.tar.gz
gsoc2013-epiphany-6a524f7dfb9b8e4d4f3c4f0c0ef6bd1ce062b504.tar.bz2
gsoc2013-epiphany-6a524f7dfb9b8e4d4f3c4f0c0ef6bd1ce062b504.tar.lz
gsoc2013-epiphany-6a524f7dfb9b8e4d4f3c4f0c0ef6bd1ce062b504.tar.xz
gsoc2013-epiphany-6a524f7dfb9b8e4d4f3c4f0c0ef6bd1ce062b504.tar.zst
gsoc2013-epiphany-6a524f7dfb9b8e4d4f3c4f0c0ef6bd1ce062b504.zip
Don't assert if we don't have a new embed in new_window callback. Part of
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.
-rw-r--r--ChangeLog7
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp10
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a005bc2f..b48c749b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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