aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--embed/mozilla/mozilla-embed.cpp9
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 13c165523..2a2f6f73c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-11-20 Marco Pesenti Gritti <marco@gnome.org>
+
+ * embed/mozilla/mozilla-embed.cpp:
+
+ If it's not possible to go up fails do not assert, just fail
+ silently.
+
2003-11-19 Marco Pesenti Gritti <marco@gnome.org>
* Makefile.am:
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index d94ffd686..497bc3753 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -468,11 +468,12 @@ impl_go_up (EphyEmbed *embed)
parent_uri = mozilla_embed_get_uri_parent (uri);
g_free (uri);
- g_return_if_fail (parent_uri != NULL);
- ephy_embed_load_url (embed, parent_uri);
-
- g_free (parent_uri);
+ if (parent_uri)
+ {
+ ephy_embed_load_url (embed, parent_uri);
+ g_free (parent_uri);
+ }
}
static char *