Source: citadel
Version: 917-1
Severity: serious
Tags: patch
libical2 is obsolete and will be removed soon.
Please change the build dependency to libical-dev
and add the attached patch.
--- citadel-917.orig/ical_dezonify.c
+++ citadel-917/ical_dezonify.c
@@ -135,13 +135,13 @@
/* syslog(LOG_DEBUG, " * Was: %s\n",
icaltime_as_ical_string(TheTime)); */
- if (TheTime.is_utc) {
+ if (icaltime_is_utc(TheTime)) {
/* syslog(LOG_DEBUG, " * This property is
ALREADY UTC.\n"); */
}
else if (utc_declared_as_tzid) {
/* syslog(LOG_DEBUG, " * Replacing '%s' TZID
with 'Z' suffix.\n", tzid); */
- TheTime.is_utc = 1;
+ TheTime.zone = icaltimezone_get_utc_timezone();
}
else {
@@ -161,7 +161,7 @@
t,
icaltimezone_get_utc_timezone()
);
- TheTime.is_utc = 1;
+ TheTime.zone = icaltimezone_get_utc_timezone();
}
icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
--- citadel-917.orig/modules/calendar/serv_calendar.c
+++ citadel-917/modules/calendar/serv_calendar.c
@@ -235,7 +235,7 @@
/* We found our own address in the attendee list. */
if (me_attend) {
/* Change the partstat from NEEDS-ACTION to ACCEPT or
DECLINE */
- icalproperty_remove_parameter(me_attend,
ICAL_PARTSTAT_PARAMETER);
+ icalproperty_remove_parameter_by_kind(me_attend,
ICAL_PARTSTAT_PARAMETER);
if (!strcasecmp(action, "accept")) {
partstat =
icalparameter_new_partstat(ICAL_PARTSTAT_ACCEPTED);
@@ -1370,7 +1370,6 @@
if (!icaltime_is_null_time(dtend)) {
dtend = icaltime_add(dtstart, dur);
dtend.zone = dtstart.zone;
- dtend.is_utc = dtstart.is_utc;
}
++num_recur;
}
@@ -1520,7 +1519,7 @@
icalcomponent_set_method(fb, ICAL_METHOD_PUBLISH);
/* Set the DTSTAMP to right now. */
- icalcomponent_set_dtstamp(fb, icaltime_from_timet(time(NULL), 0));
+ icalcomponent_set_dtstamp(fb, icaltime_from_timet_with_zone(time(NULL),
0, icaltimezone_get_utc_timezone()));
/* Add the user's email address as ORGANIZER */
sprintf(buf, "MAILTO:%s", who);
@@ -1541,10 +1540,10 @@
* to yesterday and tomorrow as default values.
*/
if (icalcomponent_get_first_property(fb, ICAL_DTSTART_PROPERTY) ==
NULL) {
- icalcomponent_set_dtstart(fb,
icaltime_from_timet(time(NULL)-86400L, 0));
+ icalcomponent_set_dtstart(fb,
icaltime_from_timet_with_zone(time(NULL)-86400L, 0,
icaltimezone_get_utc_timezone()));
}
if (icalcomponent_get_first_property(fb, ICAL_DTEND_PROPERTY) == NULL) {
- icalcomponent_set_dtend(fb,
icaltime_from_timet(time(NULL)+86400L, 0));
+ icalcomponent_set_dtend(fb,
icaltime_from_timet_with_zone(time(NULL)+86400L, 0,
icaltimezone_get_utc_timezone()));
}
/* Put the freebusy component into the calendar component */
