diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-27 07:32:39 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-27 07:32:39 +0200 |
| commit | 66fdcd86c7de338563e5da1477481a940ab3bd52 (patch) | |
| tree | c52cf7026599e68b10c533f568b132864e8573c4 /src/engine-eds.cpp | |
| parent | b0d110bac6f1f10a949abb7f985ea4becda75488 (diff) | |
| parent | 17aa86ab53e3e49cd47116f9640c89484167abcd (diff) | |
| download | ayatana-indicator-datetime-66fdcd86c7de338563e5da1477481a940ab3bd52.tar.gz ayatana-indicator-datetime-66fdcd86c7de338563e5da1477481a940ab3bd52.tar.bz2 ayatana-indicator-datetime-66fdcd86c7de338563e5da1477481a940ab3bd52.zip | |
Merge branch 'tari01-pr/fix-g-time-zone-new'
Attributes GH PR #41: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/41
Diffstat (limited to 'src/engine-eds.cpp')
| -rw-r--r-- | src/engine-eds.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
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; } |