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

event: properly detect the timezone

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2016-02-17 18:56:42 +01:00
parent 8b0aa6f499
commit 093e9fa52f
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-event.c
+27 -17
View File
@@ -91,7 +91,17 @@ get_timezone_from_ical (ECalComponentDateTime *comp)
} }
else if (comp->tzid) else if (comp->tzid)
{ {
tz = g_time_zone_new (comp->tzid); icaltimezone *zone;
gchar *tzid;
gint offset;
zone = icaltimezone_get_builtin_timezone_from_tzid (comp->tzid);
offset = icaltimezone_get_utc_offset (zone, comp->value, NULL);
tzid = format_utc_offset (offset);
tz = g_time_zone_new (tzid);
g_free (tzid);
} }
else else
{ {
@@ -181,42 +191,44 @@ gcal_event_set_component_internal (GcalEvent *self,
{ {
ECalComponentDateTime start; ECalComponentDateTime start;
ECalComponentDateTime end; ECalComponentDateTime end;
icaltimetype normalized_date; icaltimetype date;
GDateTime *date_start; GDateTime *date_start;
GTimeZone *zone_start; GTimeZone *zone_start;
GDateTime *date_end; GDateTime *date_end;
GTimeZone *zone_end; GTimeZone *zone_end;
GDateTime *aux;
gboolean start_is_all_day, end_is_all_day; gboolean start_is_all_day, end_is_all_day;
gchar *description; gchar *description;
/* Setup start date */ /* Setup start date */
e_cal_component_get_dtstart (component, &start); e_cal_component_get_dtstart (component, &start);
normalized_date = icaltime_normalize (*start.value); date = icaltime_normalize (*start.value);
zone_start = get_timezone_from_ical (&start); zone_start = get_timezone_from_ical (&start);
aux = icaltime_to_datetime (&normalized_date); date_start = g_date_time_new (zone_start,
date_start = g_date_time_to_timezone (aux, zone_start); date.year, date.month, date.day,
start_is_all_day = datetime_is_date (aux); date.is_date ? 0 : date.hour,
date.is_date ? 0 : date.minute,
date.is_date ? 0 : date.second);
start_is_all_day = datetime_is_date (date_start);
self->dt_start = g_date_time_ref (date_start); self->dt_start = date_start;
g_clear_pointer (&aux, g_date_time_unref);
/* The timezone of the event is the timezone of the start date */ /* The timezone of the event is the timezone of the start date */
self->timezone = g_time_zone_ref (zone_start); self->timezone = g_time_zone_ref (zone_start);
/* Setup end date */ /* Setup end date */
e_cal_component_get_dtend (component, &end); e_cal_component_get_dtend (component, &end);
normalized_date = icaltime_normalize (*end.value); date = icaltime_normalize (*end.value);
zone_end = get_timezone_from_ical (&end); zone_end = get_timezone_from_ical (&end);
aux = icaltime_to_datetime (&normalized_date); date_end = g_date_time_new (zone_end,
date_end = g_date_time_to_timezone (aux, zone_end); date.year, date.month, date.day,
end_is_all_day = datetime_is_date (aux); date.is_date ? 0 : date.hour,
date.is_date ? 0 : date.minute,
date.is_date ? 0 : date.second);
end_is_all_day = datetime_is_date (date_start);
self->dt_end = g_date_time_ref (date_end); self->dt_end = g_date_time_ref (date_end);
g_clear_pointer (&aux, g_date_time_unref);
/* Setup all day */ /* Setup all day */
self->all_day = start_is_all_day && end_is_all_day; self->all_day = start_is_all_day && end_is_all_day;
@@ -231,9 +243,7 @@ gcal_event_set_component_internal (GcalEvent *self,
g_object_notify (G_OBJECT (self), "location"); g_object_notify (G_OBJECT (self), "location");
g_object_notify (G_OBJECT (self), "summary"); g_object_notify (G_OBJECT (self), "summary");
g_clear_pointer (&date_start, g_date_time_unref);
g_clear_pointer (&zone_start, g_time_zone_unref); g_clear_pointer (&zone_start, g_time_zone_unref);
g_clear_pointer (&date_end, g_date_time_unref);
g_clear_pointer (&zone_end, g_time_zone_unref); g_clear_pointer (&zone_end, g_time_zone_unref);
g_clear_pointer (&description, g_free); g_clear_pointer (&description, g_free);
} }