aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--embed/ephy-favicon-cache.c6
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f40c0e57..3ddbd9707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-18 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/ephy-favicon-cache.c: (ephy_favicon_cache_load):
+
+ Don't abort on missing ephy-favicon-cache.xml file.
+ Fixes bug #121483.
+
2003-09-02 Gediminas Paulauskas <menesis@delfi.lt>
* configure.in: Added lt to ALL_LINGUAS.
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index d5b7374b3..8bd8ccf8d 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -129,7 +129,11 @@ ephy_favicon_cache_load (EphyFaviconCache *eb)
return;
doc = xmlParseFile (eb->priv->xml_file);
- g_assert (doc != NULL);
+ if (doc == NULL)
+ {
+ g_warning ("Failed to load favicon cache.\n");
+ return;
+ }
root = xmlDocGetRootElement (doc);