diff options
Diffstat (limited to 'libmateweather/mateweather-timezone.c')
| -rw-r--r-- | libmateweather/mateweather-timezone.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libmateweather/mateweather-timezone.c b/libmateweather/mateweather-timezone.c index a87c011..3b4c790 100644 --- a/libmateweather/mateweather-timezone.c +++ b/libmateweather/mateweather-timezone.c @@ -62,6 +62,7 @@ parse_tzdata (const char *tzname, time_t start, time_t end, int *offset, gboolean *has_dst, int *dst_offset) { char *filename, *contents; + const char *tzdir; gsize length; int timecnt, transitions_size, ttinfo_map_size; int initial_transition = -1, second_transition = -1; @@ -71,7 +72,10 @@ parse_tzdata (const char *tzname, time_t start, time_t end, char initial_isdst, second_isdst; int i; - filename = g_build_filename (ZONEINFO_DIR, tzname, NULL); + tzdir = g_getenv ("TZDIR"); + if (tzdir == NULL) + tzdir = ZONEINFO_DIR; + filename = g_build_filename (tzdir, tzname, NULL); if (!g_file_get_contents (filename, &contents, &length, NULL)) { g_free (filename); return FALSE; @@ -285,16 +289,16 @@ mateweather_timezone_unref (MateWeatherTimezone *zone) GType mateweather_timezone_get_type (void) { - static volatile gsize type_volatile = 0; + static gsize initialization_value = 0; - if (g_once_init_enter (&type_volatile)) { + if (g_once_init_enter (&initialization_value)) { GType type = g_boxed_type_register_static ( g_intern_static_string ("MateWeatherTimezone"), (GBoxedCopyFunc) mateweather_timezone_ref, (GBoxedFreeFunc) mateweather_timezone_unref); - g_once_init_leave (&type_volatile, type); + g_once_init_leave (&initialization_value, type); } - return type_volatile; + return initialization_value; } /** @@ -403,4 +407,3 @@ mateweather_timezone_get_dst_offset (MateWeatherTimezone *zone) g_return_val_if_fail (zone->has_dst, 0); return zone->dst_offset; } - |