From bda8a504199cbeaa5df2486a983ab91c1ad6d9c5 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 25 Oct 2017 18:14:51 -0400 Subject: [PATCH] libical_errors_are_fatal is now opaque. Change to a call to icalerror_set_errors_are_fatal() --- citadel/housekeeping.c | 2 +- citadel/modules/calendar/serv_calendar.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c index ecd7519bd..ee12b16a7 100644 --- a/citadel/housekeeping.c +++ b/citadel/housekeeping.c @@ -127,7 +127,7 @@ void do_housekeeping(void) { /* Then, do the "once per minute" stuff... */ if (do_perminute_housekeeping_now) { cdb_check_handles(); - CtdlPopulateUsersFromLDAP(); // This one isn't from a module so we put it here + //CtdlPopulateUsersFromLDAP(); // This one isn't from a module so we put it here PerformSessionHooks(EVT_TIMER); // Run all registered TIMER hooks } diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c index f727a5555..5fc4bffc4 100644 --- a/citadel/modules/calendar/serv_calendar.c +++ b/citadel/modules/calendar/serv_calendar.c @@ -2580,7 +2580,8 @@ CTDL_MODULE_INIT(calendar) { /* Tell libical to return errors instead of aborting if it gets bad data */ - icalerror_errors_are_fatal = 0; + // icalerror_errors_are_fatal = 0; (this was the old way) + icalerror_set_errors_are_fatal(0); /* Use our own application prefix in tzid's generated from system tzdata */ icaltimezone_set_tzid_prefix("/citadel.org/"); -- 2.30.2