* Yet another attempt at making ical_dezonify() send outgoing calendar items
[citadel.git] / citadel / ical_dezonify.c
index 9297350c2fcdfff6db7e13793839d4126126a933..f7ead4e3da53940210662f2876cd134cb8152fa9 100644 (file)
@@ -2,7 +2,7 @@
  * $Id$ 
  *
  * Function to go through an ical component set and convert all non-UTC
- * DTSTART and DTEND properties to UTC.  It also strips out any VTIMEZONE
+ * date/time properties to UTC.  It also strips out any VTIMEZONE
  * subcomponents afterwards, because they're irrelevant.
  *
  */
 #include <ical.h>
 #include "ical_dezonify.h"
 
+
 /*
  * Back end function for ical_dezonify()
  *
  * We supply this with the master component, the relevant component,
- * and the property (which will be a DTSTART of DTEND)
+ * and the property (which will be a DTSTART, DTEND, etc.)
  * which we want to convert to UTC.
  */
 void ical_dezonify_backend(icalcomponent *cal,
@@ -65,30 +66,37 @@ void ical_dezonify_backend(icalcomponent *cal,
        else if (icalproperty_isa(prop) == ICAL_DTEND_PROPERTY) {
                TheTime = icalproperty_get_dtend(prop);
        }
+       else if (icalproperty_isa(prop) == ICAL_DUE_PROPERTY) {
+               TheTime = icalproperty_get_due(prop);
+       }
+       else if (icalproperty_isa(prop) == ICAL_EXDATE_PROPERTY) {
+               TheTime = icalproperty_get_exdate(prop);
+       }
        else {
                return;
        }
 
-       /* Remove the property from the component. */
-       icalcomponent_remove_property(rcal, prop);
-       icalproperty_free(prop);
-
        /* Do the conversion. */
        icaltimezone_convert_time(&TheTime,
                                t,
                                icaltimezone_get_utc_timezone()
        );
+       TheTime.is_utc = 1;
+       icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
 
        /* Now add the converted property back in. */
        if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) {
-               prop = icalproperty_new_dtstart(TheTime);
-               icalcomponent_add_property(rcal, prop);
+               icalproperty_set_dtstart(prop, TheTime);
        }
        else if (icalproperty_isa(prop) == ICAL_DTEND_PROPERTY) {
-               prop = icalproperty_new_dtend(TheTime);
-               icalcomponent_add_property(rcal, prop);
+               icalproperty_set_dtend(prop, TheTime);
+       }
+       else if (icalproperty_isa(prop) == ICAL_DUE_PROPERTY) {
+               icalproperty_set_due(prop, TheTime);
+       }
+       else if (icalproperty_isa(prop) == ICAL_EXDATE_PROPERTY) {
+               icalproperty_set_exdate(prop, TheTime);
        }
-
 }
 
 
@@ -125,6 +133,8 @@ void ical_dezonify_recur(icalcomponent *cal, icalcomponent *rcal) {
                if (
                        (icalproperty_isa(p) == ICAL_DTSTART_PROPERTY)
                        || (icalproperty_isa(p) == ICAL_DTEND_PROPERTY)
+                       || (icalproperty_isa(p) == ICAL_DUE_PROPERTY)
+                       || (icalproperty_isa(p) == ICAL_EXDATE_PROPERTY)
                   ) {
                        ical_dezonify_backend(cal, rcal, p);
                }
@@ -150,7 +160,7 @@ void ical_dezonify(icalcomponent *cal) {
                icalcomponent_free(vt);
        }
 
-       lprintf(9, "dezonify:\n%s\n", icalcomponent_as_ical_string(cal));
 }
 
+
 #endif /* HAVE_ICAL_H */