From 17aa86ab53e3e49cd47116f9640c89484167abcd Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
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/engine-eds.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/engine-eds.cpp')

diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp
index 709bb4d..fc6a45b 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 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 <charles.kerr@canonical.com>
+ *   Robert Tari <robert@tari.in>
  */
 
 #include <datetime/engine-eds.h>
@@ -913,7 +915,20 @@ private:
         if (identifier == nullptr)
             g_warning("Unrecognized TZID: '%s'", tzid);
         else
-            return g_time_zone_new(identifier);
+        {
+            #if GLIB_CHECK_VERSION(2, 68, 0)
+            auto pZone = g_time_zone_new_identifier(identifier);
+
+            if (pZone == NULL)
+            {
+                pZone = g_time_zone_new_utc();
+            }
+            #else
+            auto pZone = g_time_zone_new(identifier);
+            #endif
+
+            return pZone;
+        }
 
         return nullptr;
     }
-- 
cgit v1.2.3