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 --- tests/test-eds-ics-all-day-events.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'tests/test-eds-ics-all-day-events.cpp') diff --git a/tests/test-eds-ics-all-day-events.cpp b/tests/test-eds-ics-all-day-events.cpp index c327f1a..68a3c95 100644 --- a/tests/test-eds-ics-all-day-events.cpp +++ b/tests/test-eds-ics-all-day-events.cpp @@ -1,5 +1,6 @@ /* * Copyright 2015 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 @@ -46,7 +48,16 @@ TEST_F(VAlarmFixture, MultipleAppointments) // we need a consistent timezone for the planner and our local DateTimes constexpr char const * zone_str {"America/Chicago"}; auto tz = std::make_shared(zone_str); + #if GLIB_CHECK_VERSION(2, 68, 0) + auto gtz = g_time_zone_new_identifier(zone_str); + + if (gtz == NULL) + { + gtz = g_time_zone_new_utc(); + } + #else auto gtz = g_time_zone_new(zone_str); + #endif // make a planner that looks at the first half of 2015 in EDS auto planner = std::make_shared(engine, tz); -- cgit v1.2.3