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

event: Switch to g_time_zone_new_identifier()

Browse Source 
And add the relevant NULL checks here.
This commit is contained in:
Georges Basile Stavracas Neto
2021-02-26 19:26:49 -03:00
parent 27c6d2c017
commit d1a0dbd8f5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/gcal-event.c
+10 -5
View File
@@ -175,7 +175,7 @@ get_timezone_from_ical (ECalComponentDateTime *comp)
if (g_str_has_prefix (real_tzid, LIBICAL_TZID_PREFIX)) if (g_str_has_prefix (real_tzid, LIBICAL_TZID_PREFIX))
real_tzid += strlen (LIBICAL_TZID_PREFIX); real_tzid += strlen (LIBICAL_TZID_PREFIX);
tz = g_time_zone_new (real_tzid); tz = g_time_zone_new_identifier (real_tzid);
} }
else if (zone) else if (zone)
{ {
@@ -184,14 +184,19 @@ get_timezone_from_ical (ECalComponentDateTime *comp)
offset = i_cal_timezone_get_utc_offset (zone, itt, NULL); offset = i_cal_timezone_get_utc_offset (zone, itt, NULL);
tzid = format_utc_offset (offset); tzid = format_utc_offset (offset);
tz = g_time_zone_new (tzid); tz = g_time_zone_new_identifier (tzid);
} }
else else
{ {
tz = g_time_zone_new_utc (); tz = g_time_zone_new_utc ();
} }
g_assert (tz != NULL); /*
* If tz is NULL, the timezone identifier is invalid. Fallback to UTC
* in this case.
*/
if (!tz)
tz = g_time_zone_new_utc ();
GCAL_TRACE_MSG ("%s (%p)", g_time_zone_get_identifier (tz), tz); GCAL_TRACE_MSG ("%s (%p)", g_time_zone_get_identifier (tz), tz);
@@ -1716,14 +1721,14 @@ gcal_event_get_original_timezones (GcalEvent *self,
if (g_strcmp0 (i_cal_property_get_x_name (property), "X-GNOME-CALENDAR-ORIGINAL-TZ-START") == 0) if (g_strcmp0 (i_cal_property_get_x_name (property), "X-GNOME-CALENDAR-ORIGINAL-TZ-START") == 0)
{ {
value = i_cal_property_get_x (property); value = i_cal_property_get_x (property);
original_start_tz = g_time_zone_new (value); original_start_tz = g_time_zone_new_identifier (value);
GCAL_TRACE_MSG ("Found X-GNOME-CALENDAR-ORIGINAL-TZ-START=%s", value); GCAL_TRACE_MSG ("Found X-GNOME-CALENDAR-ORIGINAL-TZ-START=%s", value);
} }
else if (g_strcmp0 (i_cal_property_get_x_name (property), "X-GNOME-CALENDAR-ORIGINAL-TZ-END") == 0) else if (g_strcmp0 (i_cal_property_get_x_name (property), "X-GNOME-CALENDAR-ORIGINAL-TZ-END") == 0)
{ {
value = i_cal_property_get_x (property); value = i_cal_property_get_x (property);
original_end_tz = g_time_zone_new (value); original_end_tz = g_time_zone_new_identifier (value);
GCAL_TRACE_MSG ("Found X-GNOME-CALENDAR-ORIGINAL-TZ-END=%s", value); GCAL_TRACE_MSG ("Found X-GNOME-CALENDAR-ORIGINAL-TZ-END=%s", value);
} }