[evolution-patches] patch for the bug #272114 [hackfest]

[pchenthill <pchenthill novell com>]

Hi,
 Have attached the patch.

thanks, chenthill.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2727
diff -u -p -r1.2727 ChangeLog
--- ChangeLog	10 May 2005 08:14:41 -0000	1.2727
+++ ChangeLog	12 May 2005 04:50:27 -0000
@@ -1,3 +1,10 @@
+2005-05-12  Chenthill Palanisamy  <pchenthill novell com>
+
+	Fixes #272114
+	* gui/dialogs/calendar-setup.c: (eccp_commit),
+	(calendar_setup_edit_calendar): Check if the color is 
+	present in the source before setting it.
+
 2005-05-09  Rodrigo Moya <rodrigo novell com>
 
 	Fixes #301350
Index: gui/dialogs/calendar-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/calendar-setup.c,v
retrieving revision 1.34
diff -u -p -r1.34 calendar-setup.c
--- gui/dialogs/calendar-setup.c	23 Dec 2004 18:12:52 -0000	1.34
+++ gui/dialogs/calendar-setup.c	12 May 2005 04:50:27 -0000
@@ -108,8 +108,8 @@ eccp_commit (EConfig *ec, GSList *items,
 		e_source_update_from_xml_node (sdialog->original_source, xml->children, NULL);
 		xmlFreeNode (xml);
 
-		e_source_get_color (sdialog->source, &color);
-		e_source_set_color (sdialog->original_source, color);
+		if (e_source_get_color (sdialog->source, &color))
+			e_source_set_color (sdialog->original_source, color);
 	} else {
 		e_source_group_add_source (sdialog->source_group, sdialog->source, -1);
 		e_source_list_sync (sdialog->source_list, NULL);
@@ -405,8 +405,8 @@ calendar_setup_edit_calendar (struct _Gt
 		sdialog->source = e_source_new_from_standalone_xml (xml);
 		g_free (xml);
 
-		e_source_get_color (source, &color);
-		e_source_set_color (sdialog->source, color);
+		if (e_source_get_color (source, &color))
+			e_source_set_color (sdialog->source, color);
 	} else {
 		GConfClient *gconf;
 		GSList *l;