* Still trying to clean up compiler warnings

diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
index 4c9ad42425f172e2845300231a9b7279bb4fa772..27d256e0113c2eb7d6d793a4c3f647b776f1078c 100644 (file)
--- a/citadel/modules/calendar/serv_calendar.c
+++ b/citadel/modules/calendar/serv_calendar.c
@@ -1776,9 +1776,9 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
        size_t reqsize;
        icalproperty *p;
        struct icaltimetype t;
-       const icaltimezone *attached_zones[5] = { NULL, NULL, NULL, NULL, NULL };
+       icaltimezone *attached_zones[5] = { NULL, NULL, NULL, NULL, NULL };
        int i;
-       const icaltimezone *z;
+       icaltimezone *z;
        int num_zones_attached = 0;
        int zone_already_attached;
 
@@ -1889,7 +1889,12 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
                        );
 
                        /* First see if there's a timezone attached to the data structure itself */
-                       z = icaltime_get_timezone(t);
+                       if (icaltime_is_utc(t)) {
+                               z = icaltimezone_get_utc_timezone();
+                       }
+                       else {
+                               z = icaltime_get_timezone(t);
+                       }
                        if (z) CtdlLogPrintf(CTDL_DEBUG, "Timezone is present in data structure\n");
 
                        /* If not, try to determine the tzid from the parameter using attached zones */