Check for failed load of the toolbars model from the XML file, and fix the

2003-10-03  Christian Persch  <chpe@cvs.gnome.org>

	* lib/egg/egg-toolbars-model.c: (safe_save_xml),
	(egg_toolbars_model_load):

	Check for failed load of the toolbars model from the XML file,
	and fix the check for failed save of same to the XML file.

2 files changed, 14 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1e9462614..277e75942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-03  Christian Persch  <chpe@cvs.gnome.org>
+
+	* lib/egg/egg-toolbars-model.c: (safe_save_xml),
+	(egg_toolbars_model_load):
+
+	Check for failed load of the toolbars model from the XML file,
+	and fix the check for failed save of same to the XML file.
+
 2003-10-02  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* src/bookmarks/ephy-bookmarks-menu.c: (add_bookmarks_menu),
diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c
index fc74aa174..091604087 100755
--- a/lib/egg/egg-toolbars-model.c
+++ b/lib/egg/egg-toolbars-model.c
@@ -146,7 +146,7 @@ safe_save_xml (const char *xml_file, xmlDocPtr doc)
 	tmp_file = g_strconcat (xml_file, ".tmp", NULL);
 	old_file = g_strconcat (xml_file, ".old", NULL);
 
-	if (!xmlSaveFormatFile (tmp_file, doc, 1))
+	if (xmlSaveFormatFile (tmp_file, doc, 1) <= 0)
 	{
 		g_warning ("Failed to write XML data to %s", tmp_file);
 		goto failed;
@@ -441,6 +441,11 @@ egg_toolbars_model_load (EggToolbarsModel *t,
   g_return_if_fail (IS_EGG_TOOLBARS_MODEL (t));
 
   doc = xmlParseFile (xml_file);
+  if (doc == NULL)
+  {
+    g_warning ("Failed to load XML data from %s", xml_file);
+    return;
+  }
   root = xmlDocGetRootElement (doc);
 
   t->priv->toolbars = g_node_new (NULL);