[evolution-patches] e-d-s 59592 crash doing tools->settings

[Not Zed <notzed ximian com>]

Should fix the crash.  Not the reason the crash is happening - bad xml in gconf.

It chooses to abort totally rather than keep what was valid; maybe it should just ignore and keep going instead.

 Michael

--

Michael Zucchi <notzed ximian com> Ximian Evolution and Free Software Developer

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.132
diff -u -3 -r1.132 ChangeLog
--- ChangeLog	3 Jun 2004 17:13:08 -0000	1.132
+++ ChangeLog	14 Jun 2004 09:13:15 -0000
@@ -1,3 +1,9 @@
+2004-06-14  Not Zed  <NotZed Ximian com>
+
+	* libedataserver/e-source-group.c
+	(e_source_group_new_from_xmldoc): abort and fail if we get an xml
+	error setting up the new_source entries.  #59592.
+
 2004-06-03  JP Rosevear  <jpr novell com>
 
 	* configure.in: bump version, libtool numbers
Index: libedataserver/e-source-group.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-source-group.c,v
retrieving revision 1.5
diff -u -3 -r1.5 e-source-group.c
--- libedataserver/e-source-group.c	25 Feb 2004 07:24:05 -0000	1.5
+++ libedataserver/e-source-group.c	14 Jun 2004 09:13:15 -0000
@@ -247,6 +247,11 @@
 	
 	for (p = root->children; p != NULL; p = p->next) {
 		ESource *new_source = e_source_new_from_xml_node (p);
+
+		if (new_source == NULL) {
+			g_object_unref (new);
+			goto done;
+		}
 		e_source_group_add_source (new, new_source, -1);
 	}