Index: evolution-exchange/storage/main.c
===================================================================
--- evolution-exchange/storage/main.c	(revision 1845)
+++ evolution-exchange/storage/main.c	(working copy)
@@ -185,6 +185,10 @@
 	char *userdir, *path;
 	char *config_directory;
 
+	/* We don't want evolution-exchange to abort on calls to icalerror_* */
+	extern int icalerror_errors_are_fatal; 
+	icalerror_errors_are_fatal = 0;
+
 #ifdef G_OS_WIN32
 	{
 		char *localedir;
Index: evolution-data-server/src/server.c
===================================================================
--- evolution-data-server/src/server.c	(revision 9803)
+++ evolution-data-server/src/server.c	(working copy)
@@ -353,6 +353,12 @@
 	gboolean did_books=FALSE, did_cals=FALSE;
 	OfflineListener *offline_listener = NULL;
 
+#if ENABLE_CALENDAR
+	/* We don't want e-d-s to abort on calls to icalerror_* */
+	extern int icalerror_errors_are_fatal; 
+	icalerror_errors_are_fatal = 0;
+#endif
+
 	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
Index: evolution/shell/main.c
===================================================================
--- evolution/shell/main.c	(revision 36835)
+++ evolution/shell/main.c	(working copy)
@@ -570,6 +570,10 @@
 	/* Make ElectricFence work.  */
 	free (malloc (10));
 
+	/* We don't want evolution to abort on calls to icalerror_* */
+	extern int icalerror_errors_are_fatal; 
+	icalerror_errors_are_fatal = 0;
+
 	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
Index: evolution/calendar/gui/alarm-notify/notify-main.c
===================================================================
--- evolution/calendar/gui/alarm-notify/notify-main.c	(revision 36835)
+++ evolution/calendar/gui/alarm-notify/notify-main.c	(working copy)
@@ -130,6 +130,10 @@
 int
 main (int argc, char **argv)
 {
+	/* We don't want evolution-alarm-notify to abort on calls to icalerror_* */
+	extern int icalerror_errors_are_fatal; 
+	icalerror_errors_are_fatal = 0;
+
 	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
