From e20db6b41132b52fdc82bcbcd5a5ec7ef8bdff79 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 5 Dec 2008 20:11:17 +0000 Subject: [PATCH] * UPDATE YOUR LIBICAL FROM SVN NOW. We are now making use of the new libical function icaltimezone_set_tzid_prefix() which allows the application to customize the namespace of tzid's generated from the host operating system's tzdata, for example: /citadel.org/Tzdata/America/New_York --- citadel/configure.ac | 2 +- citadel/modules/calendar/serv_calendar.c | 3 +++ webcit/configure.ac | 2 +- webcit/webserver.c | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/citadel/configure.ac b/citadel/configure.ac index 5f74b0f62..5d1a23900 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -483,7 +483,7 @@ fi dnl Checks for the libical iCalendar library. AC_CHECK_HEADER(libical/ical.h, - [AC_CHECK_LIB(ical, icalcomponent_as_ical_string_r, + [AC_CHECK_LIB(ical, icaltimezone_set_tzid_prefix, [ SERVER_LIBS="-lical $SERVER_LIBS" ], diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c index b1610c7fe..be7e47b68 100644 --- a/citadel/modules/calendar/serv_calendar.c +++ b/citadel/modules/calendar/serv_calendar.c @@ -2314,6 +2314,9 @@ CTDL_MODULE_INIT(calendar) /* Tell libical to return errors instead of aborting if it gets bad data */ icalerror_errors_are_fatal = 0; + /* Use our own application prefix in tzid's generated from system tzdata */ + icaltimezone_set_tzid_prefix("/citadel.org/"); + /* Initialize our hook functions */ CtdlRegisterMessageHook(ical_obj_beforesave, EVT_BEFORESAVE); CtdlRegisterMessageHook(ical_obj_aftersave, EVT_AFTERSAVE); diff --git a/webcit/configure.ac b/webcit/configure.ac index 18f006637..fa8de7976 100644 --- a/webcit/configure.ac +++ b/webcit/configure.ac @@ -194,7 +194,7 @@ AC_CHECK_HEADER(libcitadel.h, dnl Checks for the libical iCalendar library. AC_CHECK_HEADER(libical/ical.h, - [AC_CHECK_LIB(ical, icalcomponent_as_ical_string_r, + [AC_CHECK_LIB(ical, icaltimezone_set_tzid_prefix, [ LIBS="-lical $LIBS" ], diff --git a/webcit/webserver.c b/webcit/webserver.c index 376ea44c5..5c107f382 100644 --- a/webcit/webserver.c +++ b/webcit/webserver.c @@ -891,6 +891,9 @@ int main(int argc, char **argv) /* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */ icalerror_errors_are_fatal = 0; + /* Use our own prefix on tzid's generated from system tzdata */ + icaltimezone_set_tzid_prefix("/citadel.org/"); + /* * Set up a place to put thread-specific data. * We only need a single pointer per thread - it points to the -- 2.30.2