libical_errors_are_fatal is now opaque. Change to a call to icalerror_set_errors_are...

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index ecd7519bd8a81f169bde004d4635674bc28c757d..ee12b16a7b690832eee9eda67999c166abf07a0a 100644 (file)
--- 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 f727a5555d3a387a591ca8826d4e37b52ca3a5a6..5fc4bffc41d9c782e5edc150a36de194b6d351a5 100644 (file)
--- 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/");