From 6cc5bbd074de6eed440ba415e18e439229523ffb Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Tue, 23 Feb 2021 10:13:56 -0300 Subject: [PATCH] datetime: Use g_time_zone_new_identifier g_time_zone_new() is deprecated in favour of g_time_zone_new_identifier(). g_time_zone_new_identifier() returns NULL if no matching identifier is found, so warn and fallback to UTC in that case. --- panels/datetime/cc-datetime-panel.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c index c1a84770a..ab2b3eeab 100644 --- a/panels/datetime/cc-datetime-panel.c +++ b/panels/datetime/cc-datetime-panel.c @@ -518,7 +518,13 @@ location_changed_cb (CcDateTimePanel *self, self->current_location = location; - timezone = g_time_zone_new (location->zone); + timezone = g_time_zone_new_identifier (location->zone); + if (!timezone) + { + g_warning ("Could not find timezone \"%s\", using UTC instead", location->zone); + timezone = g_time_zone_new_utc (); + } + old_date = self->date; self->date = g_date_time_to_timezone (old_date, timezone); cc_time_editor_set_time (CC_TIME_EDITOR (self->time_editor), -- GitLab