From 17aa86ab53e3e49cd47116f9640c89484167abcd Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 18 Jun 2021 02:48:29 +0200 Subject: If possible, avoid deprecated g_time_zone_new fixes https://github.com/AyatanaIndicators/ayatana-indicator-datetime/issues/34 --- src/clock-live.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/clock-live.cpp') diff --git a/src/clock-live.cpp b/src/clock-live.cpp index b6d7c12..710c58d 100644 --- a/src/clock-live.cpp +++ b/src/clock-live.cpp @@ -1,5 +1,6 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2021 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -15,6 +16,7 @@ * * Authors: * Charles Kerr + * Robert Tari */ #include @@ -162,7 +164,16 @@ private: void setTimezone(const std::string& str) { g_clear_pointer(&m_gtimezone, g_time_zone_unref); + #if GLIB_CHECK_VERSION(2, 68, 0) + m_gtimezone = g_time_zone_new_identifier(str.c_str()); + + if (m_gtimezone == NULL) + { + m_gtimezone = g_time_zone_new_utc(); + } + #else m_gtimezone = g_time_zone_new(str.c_str()); + #endif m_owner.minute_changed(); } -- cgit v1.2.3