Source: webcit
Version: 917-dfsg-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.
--- webcit-917-dfsg.orig/calendar_tools.c
+++ webcit-917-dfsg/calendar_tools.c
@@ -151,7 +151,6 @@
t->minute = IBSTR(vname);
/* time zone is set to the default zone for this server */
- t->is_utc = 0;
t->is_date = 0;
t->zone = get_default_icaltimezone();
}
@@ -170,7 +169,7 @@
sscanf((char*)BSTR(prefix), "%04d-%02d-%02d", &t->year, &t->month,
&t->day);
/* time zone is set to the default zone for this server */
- t->is_utc = 1;
+ t->zone = icaltimezone_get_utc_timezone();
t->is_date = 1;
}
--- webcit-917-dfsg.orig/calendar_view.c
+++ webcit-917-dfsg/calendar_view.c
@@ -198,7 +198,6 @@
starting_tm.tm_hour = 0;
starting_tm.tm_min = 0;
today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0,
icaltimezone_get_utc_timezone());
- today_start_t.is_utc = 1;
memset(&ending_tm, 0, sizeof(struct tm));
ending_tm.tm_year = year - 1900;
@@ -207,7 +206,6 @@
ending_tm.tm_hour = 23;
ending_tm.tm_min = 59;
today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0,
icaltimezone_get_utc_timezone());
- today_end_t.is_utc = 1;
/*
* Create another one without caring about the timezone for all day
events.
@@ -854,7 +852,6 @@
starting_tm.tm_hour = 0;
starting_tm.tm_min = 0;
today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0,
icaltimezone_get_utc_timezone());
- today_start_t.is_utc = 1;
memset(&ending_tm, 0, sizeof(struct tm));
ending_tm.tm_year = year - 1900;
@@ -863,7 +860,6 @@
ending_tm.tm_hour = 23;
ending_tm.tm_min = 59;
today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0,
icaltimezone_get_utc_timezone());
- today_end_t.is_utc = 1;
/*
* Create another one without caring about the timezone for all day
events.
--- webcit-917-dfsg.orig/event.c
+++ webcit-917-dfsg/event.c
@@ -264,8 +264,6 @@
((yesbstr("alldayevent")) ? 1 : 0),
icaltimezone_get_utc_timezone()
);
- t_start.is_utc = 1;
-
}
display_icaltimetype_as_webform(&t_start, "dtstart", 0);
@@ -854,8 +852,8 @@
/* Add NOW() to the calendar object... */
icalcomponent_set_dtstamp(vevent,
- icaltime_from_timet(
- time(NULL), 0));
+ icaltime_from_timet_with_zone(
+ time(NULL), 0,
icaltimezone_get_utc_timezone()));
if (havebstr("summary")) {
icalcomponent_add_property(vevent,
--- webcit-917-dfsg.orig/ical_dezonify.c
+++ webcit-917-dfsg/ical_dezonify.c
@@ -116,7 +116,7 @@
syslog(LOG_DEBUG, " * Was: %s\n",
icaltime_as_ical_string(TheTime));
#endif
- if (TheTime.is_utc) {
+ if (icaltime_is_utc(TheTime)) {
#ifdef DBG_ICAL
syslog(LOG_DEBUG, " * This property is ALREADY
UTC.\n");
#endif
@@ -126,7 +126,7 @@
#ifdef DBG_ICAL
syslog(LOG_DEBUG, " * Replacing '%s' TZID with
'Z' suffix.\n", tzid);
#endif
- TheTime.is_utc = 1;
+ TheTime.zone = icaltimezone_get_utc_timezone();
}
else {
@@ -146,7 +146,7 @@
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);
