Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "event: correctly store timezones"

Browse Source 
This reverts commit ce2c955269.

This commit is not right. Lots of code in Calendar relies on being able
to set the timezone of a GcalEvent, and this results in us always
ignoring the timezone set by Calendar in preference to whatever happened
to be in the ECalComponentDateTime previously. That might not be so bad,
but additionally, the time is not adjusted accordingly, so this actually
results in the time of events changing unexpectedly from what Calendar
is trying to set.

The code to explicitly store UTC times for all day events is OK (I
guess) and will be restored in a subsequent commit.
This commit is contained in:
Michael Catanzaro
2017-12-05 21:54:39 -06:00
parent 1d8a164634
commit 281ed44f1c
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-event.c
+13 -22
View File
@@ -221,11 +221,11 @@ get_timezone_from_ical (ECalComponentDateTime *comp)
}
static ECalComponentDateTime*
build_component_from_datetime (GcalEvent *self,
icaltimezone *current_tz,
GDateTime *dt)
build_component_from_datetime (GcalEvent *self,
GDateTime *dt)
{
ECalComponentDateTime *comp_dt;
gchar *tzid;
if (!dt)
return NULL;
@@ -234,12 +234,15 @@ build_component_from_datetime (GcalEvent *self,
comp_dt->value = NULL;
comp_dt->tzid = NULL;
tzid = g_date_time_format (dt, "%Z");
comp_dt->value = datetime_to_icaltime (dt);
comp_dt->value->zone = self->all_day ? icaltimezone_get_utc_timezone () : current_tz;
comp_dt->value->zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
comp_dt->value->is_date = self->all_day;
/* All day events have UTC timezone */
comp_dt->tzid = g_strdup (self->all_day ? "UTC" : icaltimezone_get_tzid (current_tz));
/* All day events have no timezone */
if (!self->all_day)
comp_dt->tzid = tzid;
return comp_dt;
}
@@ -987,25 +990,19 @@ gcal_event_set_date_end (GcalEvent *self,
if (self->dt_end != dt)
{
ECalComponentDateTime *component_dt, current;
ECalComponentDateTime *component_dt;
g_clear_pointer (&self->dt_end, g_date_time_unref);
self->dt_end = g_date_time_ref (dt);
/* Retrieve the current timezone */
e_cal_component_get_dtstart (self->component, &current);
/* Setup the ECalComponent's datetime value */
component_dt = build_component_from_datetime (self,
icaltimezone_get_builtin_timezone_from_tzid (current.tzid),
dt);
component_dt = build_component_from_datetime (self, dt);
e_cal_component_set_dtend (self->component, component_dt);
e_cal_component_commit_sequence (self->component);
g_object_notify (G_OBJECT (self), "date-end");
e_cal_component_free_datetime (&current);
e_cal_component_free_datetime (component_dt);
g_free (component_dt);
}
@@ -1042,25 +1039,19 @@ gcal_event_set_date_start (GcalEvent *self,
if (self->dt_start != dt)
{
ECalComponentDateTime *component_dt, current;
ECalComponentDateTime *component_dt;
g_clear_pointer (&self->dt_start, g_date_time_unref);
self->dt_start = g_date_time_ref (dt);
/* Retrieve the current timezone */
e_cal_component_get_dtstart (self->component, &current);
/* Setup the ECalComponent's datetime value */
component_dt = build_component_from_datetime (self,
icaltimezone_get_builtin_timezone_from_tzid (current.tzid),
dt);
component_dt = build_component_from_datetime (self, dt);
e_cal_component_set_dtstart (self->component, component_dt);
e_cal_component_commit_sequence (self->component);
g_object_notify (G_OBJECT (self), "date-start");
e_cal_component_free_datetime (&current);
e_cal_component_free_datetime (component_dt);
g_free (component_dt);
}