libical3 compatibility , patches submitted by Adrian Bunk

[citadel.git] / webcit / ical_dezonify.c

diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index 044825592e4d213c0eeda42f6149c55a74eb96b1..de444a9d5522a791e5a56083c0195b9de0323dcf 100644 (file)
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -1,13 +1,10 @@
 /* 
- * $Id$ 
- * 
  * Function to go through an ical component set and convert all non-UTC
  * date/time properties to UTC.  It also strips out any VTIMEZONE
  * subcomponents afterwards, because they're irrelevant.
  *
  * Everything here will work on both a fully encapsulated VCALENDAR component
  * or any type of subcomponent.
- *
  */
 
 #include "webcit.h"
@@ -21,17 +18,17 @@
 icaltimezone *get_default_icaltimezone(void) {
 
         icaltimezone *zone = NULL;
-       const char *default_zone_name = ChrPtr(serv_info.serv_default_cal_zone);
+       const char *default_zone_name = ChrPtr(WC->serv_info->serv_default_cal_zone);
 
         if (!zone) {
                 zone = icaltimezone_get_builtin_timezone(default_zone_name);
         }
         if (!zone) {
-               lprintf(1, "Unable to load '%s' time zone.  Defaulting to UTC.\n", default_zone_name);
+               syslog(LOG_WARNING, "Unable to load '%s' time zone.  Defaulting to UTC.\n", default_zone_name);
                 zone = icaltimezone_get_utc_timezone();
        }
        if (!zone) {
-               lprintf(1, "Unable to load UTC time zone!\n");
+               syslog(LOG_ERR, "Unable to load UTC time zone!\n");
        }
         return zone;
 }
@@ -67,19 +64,19 @@ void ical_dezonify_backend(icalcomponent *cal,
                /* Convert it to an icaltimezone type. */
                if (tzid != NULL) {
 #ifdef DBG_ICAL
-                       lprintf(9, "                * Stringy supplied timezone is: '%s'\n", tzid);
+                       syslog(LOG_DEBUG, "                * Stringy supplied timezone is: '%s'\n", tzid);
 #endif
                        if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) {
                                utc_declared_as_tzid = 1;
 #ifdef DBG_ICAL
-                               lprintf(9, "                * ...and we handle that internally.\n");
+                               syslog(LOG_DEBUG, "                * ...and we handle that internally.\n");
 #endif
                        }
                        else {
                                /* try attached first */
                                t = icalcomponent_get_timezone(cal, tzid);
 #ifdef DBG_ICAL
-                               lprintf(9, "                * ...and I %s have tzdata for that zone.\n",
+                               syslog(LOG_DEBUG, "                * ...and I %s have tzdata for that zone.\n",
                                        (t ? "DO" : "DO NOT")
                                );
 #endif
@@ -88,7 +85,7 @@ void ical_dezonify_backend(icalcomponent *cal,
                                        t = icaltimezone_get_builtin_timezone(tzid);
 #ifdef DBG_ICAL
                                        if (t) {
-                                               lprintf(9, "                * Using system tzdata!\n");
+                                               syslog(LOG_DEBUG, "                * Using system tzdata!\n");
                                        }
 #endif
                                }
@@ -116,32 +113,32 @@ void ical_dezonify_backend(icalcomponent *cal,
        }
 
 #ifdef DBG_ICAL
-       lprintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
+       syslog(LOG_DEBUG, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
 #endif
 
-       if (TheTime.is_utc) {
+       if (icaltime_is_utc(TheTime)) {
 #ifdef DBG_ICAL
-               lprintf(9, "                * This property is ALREADY UTC.\n");
+               syslog(LOG_DEBUG, "                * This property is ALREADY UTC.\n");
 #endif
        }
 
        else if (utc_declared_as_tzid) {
 #ifdef DBG_ICAL
-               lprintf(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid);
+               syslog(LOG_DEBUG, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid);
 #endif
-               TheTime.is_utc = 1;
+               TheTime.zone = icaltimezone_get_utc_timezone();
        }
 
        else {
                /* Do the conversion. */
                if (t != NULL) {
 #ifdef DBG_ICAL
-                       lprintf(9, "                * Timezone prop found.  Converting to UTC.\n");
+                       syslog(LOG_DEBUG, "                * Timezone prop found.  Converting to UTC.\n");
 #endif
                }
                else {
 #ifdef DBG_ICAL
-                       lprintf(9, "                * Converting default timezone to UTC.\n");
+                       syslog(LOG_DEBUG, "                * Converting default timezone to UTC.\n");
 #endif
                }
 
@@ -149,12 +146,12 @@ void ical_dezonify_backend(icalcomponent *cal,
                        t = get_default_icaltimezone();
                }
                icaltimezone_convert_time(&TheTime, t, icaltimezone_get_utc_timezone());
-               TheTime.is_utc = 1;
+               TheTime.zone = icaltimezone_get_utc_timezone();
        }
 
        icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
 #ifdef DBG_ICAL
-       lprintf(9, "                * Now: %s\n", icaltime_as_ical_string(TheTime));
+       syslog(LOG_DEBUG, "                * Now: %s\n", icaltime_as_ical_string(TheTime));
 #endif
 
        /* Now add the converted property back in. */
@@ -222,7 +219,7 @@ void ical_dezonify(icalcomponent *cal) {
        icalcomponent *vt = NULL;
 
 #ifdef DBG_ICAL
-       lprintf(9, "ical_dezonify() started\n");
+       syslog(LOG_DEBUG, "ical_dezonify() started\n");
 #endif
 
        /* Convert all times to UTC */
@@ -236,7 +233,7 @@ void ical_dezonify(icalcomponent *cal) {
        }
 
 #ifdef DBG_ICAL
-       lprintf(9, "ical_dezonify() completed\n");
+       syslog(LOG_DEBUG, "ical_dezonify() completed\n");
 #endif
 }