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

calendar-server: Uses wrong timezone for event times

Browse Source 
The conversion to UTC/time_t time was not using correct timezone.

Closes https://gitlab.gnome.org/GNOME/gnome-shell/issues/1714
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/806


(cherry picked from commit 28c535e341)
This commit is contained in:
Milan Crha 2019-11-05 11:07:40 +00:00 committed by Florian Müllner
parent 750c5acd30
commit c1ecd304e7
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,8 @@ typedef struct
} CollectAppointmentsData; } CollectAppointmentsData;
static time_t static time_t
get_time_from_property (ICalComponent *icomp, get_time_from_property (ECalClient *cal,
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)
@ -124,12 +125,14 @@ get_time_from_property (ICalComponent *icomp,
param = i_cal_property_get_first_parameter (prop, I_CAL_TZID_PARAMETER); param = i_cal_property_get_first_parameter (prop, I_CAL_TZID_PARAMETER);
if (param) if (param)
timezone = i_cal_timezone_get_builtin_timezone_from_tzid (i_cal_parameter_get_tzid (param)); timezone = e_timezone_cache_get_timezone (E_TIMEZONE_CACHE (cal), i_cal_parameter_get_tzid (param));
else if (i_cal_time_is_utc (itt)) else if (i_cal_time_is_utc (itt))
timezone = i_cal_timezone_get_utc_timezone (); timezone = i_cal_timezone_get_utc_timezone ();
else else
timezone = default_zone; timezone = default_zone;
i_cal_time_set_timezone (itt, timezone);
retval = i_cal_time_as_timet_with_zone (itt, timezone); retval = i_cal_time_as_timet_with_zone (itt, timezone);
g_clear_object (&param); g_clear_object (&param);
@ -180,27 +183,32 @@ get_ical_description (ICalComponent *icomp)
} }
static inline time_t static inline time_t
get_ical_start_time (ICalComponent *icomp, get_ical_start_time (ECalClient *cal,
ICalComponent *icomp,
ICalTimezone *default_zone) ICalTimezone *default_zone)
{ {
return get_time_from_property (icomp, return get_time_from_property (cal,
icomp,
I_CAL_DTSTART_PROPERTY, I_CAL_DTSTART_PROPERTY,
i_cal_property_get_dtstart, i_cal_property_get_dtstart,
default_zone); default_zone);
} }
static inline time_t static inline time_t
get_ical_end_time (ICalComponent *icomp, get_ical_end_time (ECalClient *cal,
ICalComponent *icomp,
ICalTimezone *default_zone) ICalTimezone *default_zone)
{ {
return get_time_from_property (icomp, return get_time_from_property (cal,
icomp,
I_CAL_DTEND_PROPERTY, I_CAL_DTEND_PROPERTY,
i_cal_property_get_dtend, i_cal_property_get_dtend,
default_zone); default_zone);
} }
static gboolean static gboolean
get_ical_is_all_day (ICalComponent *icomp, get_ical_is_all_day (ECalClient *cal,
ICalComponent *icomp,
time_t start_time, time_t start_time,
ICalTimezone *default_zone) ICalTimezone *default_zone)
{ {
@ -226,7 +234,7 @@ get_ical_is_all_day (ICalComponent *icomp,
start_tm->tm_hour != 0) start_tm->tm_hour != 0)
return FALSE; return FALSE;
if ((end_time = get_ical_end_time (icomp, default_zone))) if ((end_time = get_ical_end_time (cal, icomp, default_zone)))
return (end_time - start_time) % 86400 == 0; return (end_time - start_time) % 86400 == 0;
prop = i_cal_component_get_first_property (icomp, I_CAL_DURATION_PROPERTY); prop = i_cal_component_get_first_property (icomp, I_CAL_DURATION_PROPERTY);
@ -244,20 +252,24 @@ get_ical_is_all_day (ICalComponent *icomp,
} }
static inline time_t static inline time_t
get_ical_due_time (ICalComponent *icomp, get_ical_due_time (ECalClient *cal,
ICalComponent *icomp,
ICalTimezone *default_zone) ICalTimezone *default_zone)
{ {
return get_time_from_property (icomp, return get_time_from_property (cal,
icomp,
I_CAL_DUE_PROPERTY, I_CAL_DUE_PROPERTY,
i_cal_property_get_due, i_cal_property_get_due,
default_zone); default_zone);
} }
static inline time_t static inline time_t
get_ical_completed_time (ICalComponent *icomp, get_ical_completed_time (ECalClient *cal,
ICalComponent *icomp,
ICalTimezone *default_zone) ICalTimezone *default_zone)
{ {
return get_time_from_property (icomp, return get_time_from_property (cal,
icomp,
I_CAL_COMPLETED_PROPERTY, I_CAL_COMPLETED_PROPERTY,
i_cal_property_get_completed, i_cal_property_get_completed,
default_zone); default_zone);
@ -411,9 +423,10 @@ calendar_appointment_init (CalendarAppointment *appointment,
appointment->summary = get_ical_summary (icomp); appointment->summary = get_ical_summary (icomp);
appointment->description = get_ical_description (icomp); appointment->description = get_ical_description (icomp);
appointment->color_string = get_source_color (cal); appointment->color_string = get_source_color (cal);
appointment->start_time = get_ical_start_time (icomp, default_zone); appointment->start_time = get_ical_start_time (cal, icomp, default_zone);
appointment->end_time = get_ical_end_time (icomp, default_zone); appointment->end_time = get_ical_end_time (cal, icomp, default_zone);
appointment->is_all_day = get_ical_is_all_day (icomp, appointment->is_all_day = get_ical_is_all_day (cal,
icomp,
appointment->start_time, appointment->start_time,
default_zone); default_zone);
} }
@ -442,10 +455,8 @@ generate_instances_cb (ICalComponent *icomp,
GHashTable *appointments = ((CollectAppointmentsData *)user_data)->appointments; GHashTable *appointments = ((CollectAppointmentsData *)user_data)->appointments;
CalendarAppointment *appointment; CalendarAppointment *appointment;
CalendarOccurrence *occurrence; CalendarOccurrence *occurrence;
ICalTimezone *default_zone;
const gchar *uid; const gchar *uid;
default_zone = e_cal_client_get_default_timezone (cal);
uid = i_cal_component_get_uid (icomp); uid = i_cal_component_get_uid (icomp);
appointment = g_hash_table_lookup (appointments, uid); appointment = g_hash_table_lookup (appointments, uid);
@ -456,8 +467,8 @@ generate_instances_cb (ICalComponent *icomp,
} }
occurrence = g_new0 (CalendarOccurrence, 1); occurrence = g_new0 (CalendarOccurrence, 1);
occurrence->start_time = i_cal_time_as_timet_with_zone (instance_start, default_zone); occurrence->start_time = i_cal_time_as_timet_with_zone (instance_start, i_cal_time_get_timezone (instance_start));
occurrence->end_time = i_cal_time_as_timet_with_zone (instance_end, default_zone); occurrence->end_time = i_cal_time_as_timet_with_zone (instance_end, i_cal_time_get_timezone (instance_end));
occurrence->rid = e_cal_util_component_get_recurid_as_string (icomp); occurrence->rid = e_cal_util_component_get_recurid_as_string (icomp);
appointment->occurrences = g_slist_append (appointment->occurrences, occurrence); appointment->occurrences = g_slist_append (appointment->occurrences, occurrence);