* Yet another attempt at making ical_dezonify() send outgoing calendar items

[citadel.git] / citadel / serv_calendar.c

diff --git a/citadel/serv_calendar.c b/citadel/serv_calendar.c
index 4abbbf776b795d213780a1ba9cd98c6ed5fffa39..018d2582155f1275c101761d1343f2df343aa248 100644 (file)
--- a/citadel/serv_calendar.c
+++ b/citadel/serv_calendar.c
@@ -139,7 +139,6 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
        }
 
        the_reply = icalcomponent_new_clone(request);
-       ical_dezonify(the_reply);
        if (the_reply == NULL) {
                lprintf(3, "ERROR: cannot clone request\n");
                return;
@@ -273,7 +272,9 @@ void ical_locate_part(char *name, char *filename, char *partnum, char *disp,
        }
        if (strcasecmp(partnum, ird->desired_partnum)) return;
        ird->cal = icalcomponent_new_from_string(content);
-       ical_dezonify(ird->cal);
+       if (ird->cal != NULL) {
+               ical_dezonify(ird->cal);
+       }
 }
 
 
@@ -415,7 +416,6 @@ void ical_locate_original_event(char *name, char *filename, char *partnum, char
                icalcomponent_free(oec->c);
        }
        oec->c = icalcomponent_new_from_string(content);
-       ical_dezonify(oec->c);
 }
 
 
@@ -451,7 +451,6 @@ void ical_merge_attendee_reply(icalcomponent *event, icalcomponent *reply) {
 
        /* Clone the reply, because we're going to rip its guts out. */
        reply = icalcomponent_new_clone(reply);
-       ical_dezonify(reply);
 
        /* At this point we're looking at the correct subcomponents.
         * Iterate through the attendees looking for a match.
@@ -1070,7 +1069,6 @@ void ical_send_out_invitations(icalcomponent *cal) {
                lprintf(3, "ERROR: cannot clone calendar object\n");
                return;
        }
-       ical_dezonify(the_request);
 
        /* Extract the summary string -- we'll use it as the
         * message subject for the request
@@ -1129,7 +1127,8 @@ void ical_send_out_invitations(icalcomponent *cal) {
        /* Set the method to REQUEST */
        icalcomponent_set_method(encaps, ICAL_METHOD_REQUEST);
 
-       /* FIXME: here we need to insert a VTIMEZONE object. */
+       /* Now make sure all of the DTSTART and DTEND properties are UTC. */
+       ical_dezonify(the_request);
 
        /* Here we go: put the VEVENT into the VCALENDAR.  We now no longer
         * are responsible for "the_request"'s memory -- it will be freed
@@ -1246,7 +1245,6 @@ void ical_ctdl_set_extended_msgid(char *name, char *filename, char *partnum,
         */
        if (!strcasecmp(cbtype, "text/calendar")) {
                cal = icalcomponent_new_from_string(content);
-               ical_dezonify(cal);
                if (cal != NULL) {
                        p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY);
                        if (p != NULL) {
@@ -1373,7 +1371,6 @@ void ical_obj_aftersave_backend(char *name, char *filename, char *partnum,
        if (!strcasecmp(cbtype, "text/calendar")) {
                cal = icalcomponent_new_from_string(content);
                if (cal != NULL) {
-                       ical_dezonify(cal);
                        ical_saving_vevent(cal);
                        icalcomponent_free(cal);
                }