brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calendar-server: Calculate event end according to spec if missing

Browse Source 
The ical specification allows events to omit an end, which for dates
means the end is start + 1 day and for date times it is equal to the
start.

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4753
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2023>
This commit is contained in:
Sebastian Keller 2021-11-04 13:59:18 +01:00 committed by Marge Bot
parent 72a6450017
commit b37fa61eb0
1 changed files with 61 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/calendar-server/gnome-shell-calendar-server.c
View File

@ -112,22 +112,23 @@ typedef struct
time_t end_time; time_t end_time;
} CalendarAppointment; } CalendarAppointment;
static time_t static gboolean
get_time_from_property (ECalClient *cal, get_time_from_property (ECalClient *cal,
ICalComponent *icomp, ICalComponent *icomp,
ICalPropertyKind prop_kind, ICalPropertyKind prop_kind,
ICalTime * (* get_prop_func) (ICalProperty *prop), ICalTime * (* get_prop_func) (ICalProperty *prop),
ICalTimezone *default_zone) ICalTimezone *default_zone,
ICalTime **out_itt,
ICalTimezone **out_timezone)
{ {
ICalProperty *prop; ICalProperty *prop;
ICalTime *itt; ICalTime *itt;
ICalParameter *param; ICalParameter *param;
ICalTimezone *timezone = NULL; ICalTimezone *timezone = NULL;
time_t retval;
prop = i_cal_component_get_first_property (icomp, prop_kind); prop = i_cal_component_get_first_property (icomp, prop_kind);
if (!prop) if (!prop)
return 0; return FALSE;
itt = get_prop_func (prop); itt = get_prop_func (prop);
@ -141,13 +142,13 @@ get_time_from_property (ECalClient *cal,
i_cal_time_set_timezone (itt, timezone); i_cal_time_set_timezone (itt, timezone);
retval = i_cal_time_as_timet_with_zone (itt, timezone);
g_clear_object (&param); g_clear_object (&param);
g_clear_object (&prop); g_clear_object (&prop);
g_clear_object (&itt);
return retval; *out_itt = itt;
*out_timezone = timezone;
return TRUE;
} }
static inline time_t static inline time_t
@ -155,11 +156,26 @@ get_ical_start_time (ECalClient *cal,
ICalComponent *icomp, ICalComponent *icomp,
ICalTimezone *default_zone) ICalTimezone *default_zone)
{ {
return get_time_from_property (cal, ICalTime *itt;
icomp, ICalTimezone *timezone;
I_CAL_DTSTART_PROPERTY, time_t retval;
i_cal_property_get_dtstart,
default_zone); if (!get_time_from_property (cal,
icomp,
I_CAL_DTSTART_PROPERTY,
i_cal_property_get_dtstart,
default_zone,
&itt,
&timezone))
{
return 0;
}
retval = i_cal_time_as_timet_with_zone (itt, timezone);
g_clear_object (&itt);
return retval;
} }
static inline time_t static inline time_t
@ -167,11 +183,38 @@ get_ical_end_time (ECalClient *cal,
ICalComponent *icomp, ICalComponent *icomp,
ICalTimezone *default_zone) ICalTimezone *default_zone)
{ {
return get_time_from_property (cal, ICalTime *itt;
icomp, ICalTimezone *timezone;
I_CAL_DTEND_PROPERTY, time_t retval;
i_cal_property_get_dtend,
default_zone); if (!get_time_from_property (cal,
icomp,
I_CAL_DTEND_PROPERTY,
i_cal_property_get_dtend,
default_zone,
&itt,
&timezone))
{
if (!get_time_from_property (cal,
icomp,
I_CAL_DTSTART_PROPERTY,
i_cal_property_get_dtstart,
default_zone,
&itt,
&timezone))
{
return 0;
}
if (i_cal_time_is_date (itt))
i_cal_time_adjust (itt, 1, 0, 0, 0);
}
retval = i_cal_time_as_timet_with_zone (itt, timezone);
g_clear_object (&itt);
return retval;
} }
static CalendarAppointment * static CalendarAppointment *