From a439fd2b1de69dd2302ff1d224ff3f064bacfb2c Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Tue, 18 Feb 2020 15:46:24 +0000 Subject: [PATCH] date-time-utils: fall back to UTC when timezone is unrecognized For whatever reason, libical doesn't support the Etc/UTC timezone. Currently we crash gnome-calendar whenever libical doesn't support the current timezone (as returned by GTimeZone). Let's fall back to UTC instead. Fixes #485 --- src/utils/gcal-date-time-utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/gcal-date-time-utils.c b/src/utils/gcal-date-time-utils.c index 48da114c..ac2791be 100644 --- a/src/utils/gcal-date-time-utils.c +++ b/src/utils/gcal-date-time-utils.c @@ -249,7 +249,9 @@ gcal_timezone_to_icaltimezone (GTimeZone *tz) tzid = g_time_zone_get_identifier (tz); ical_tz = i_cal_timezone_get_builtin_timezone (tzid); - g_assert (ical_tz != NULL); + if (!ical_tz) + ical_tz = i_cal_timezone_get_utc_timezone (); + return ical_tz; }