* 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

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 5f74b0f62ae599a0f39d3e06747a611bb6366aac..5d1a2390027aa5320d8478a38fedefe2d2e905f1 100644 (file)
--- 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 b1610c7fecaad4efce96041a7a8888f802ec3e7e..be7e47b68008b2b8b4627fdaf901b4f21974ed98 100644 (file)
--- 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 18f006637347e3396ab2bdd4ad9a5409bf5ed334..fa8de7976c2c96231968ef282f50128236e3e58b 100644 (file)
--- 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 376ea44c5f841a41c5c4df3bdf899e822e27d614..5c107f3821094480ffe957903b40804e030eacf7 100644 (file)
--- 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