gtimezone.c: Fix identifier assignment on Windows
On Windows, we may be using the US DST boundaries by using the default
"Pacific Standard Time" for rules_from_windows_time_zone() in
rules_from_identifier(). This has the unfortunate side-effect of
hardcoding the out_identifier to "Pacific Standard Time", which is
likely not what we want.
Instead, upon retrieving the items successfully using
rules_from_windows_time_zone ("Pacific Standard Time", ...), we just
set the out_identifier to whatever identifier that was passed into
rules_from_identifier().
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index 279a788..4585344 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
@@ -703,7 +703,8 @@
static gint
rules_from_windows_time_zone (const gchar *identifier,
gchar **out_identifier,
- TimeZoneRule **rules)
+ TimeZoneRule **rules,
+ gboolean copy_identifier)
{
HKEY key;
gchar *subkey, *subkey_dynamic;
@@ -722,10 +723,12 @@
if (n == 0)
return 0;
- g_assert (out_identifier != NULL);
+ g_assert (copy_identifier == FALSE || out_identifier != NULL);
g_assert (rules != NULL);
- *out_identifier = NULL;
+ if (copy_identifier)
+ *out_identifier = NULL;
+
*rules = NULL;
key_name = NULL;
@@ -855,7 +858,8 @@
else
(*rules)[rules_num - 1].start_year = (*rules)[rules_num - 2].start_year + 1;
- *out_identifier = g_steal_pointer (&key_name);
+ if (copy_identifier)
+ *out_identifier = g_steal_pointer (&key_name);
return rules_num;
}
@@ -1392,9 +1396,15 @@
/* Use US rules, Windows' default is Pacific Standard Time */
if ((rules_num = rules_from_windows_time_zone ("Pacific Standard Time",
- out_identifier,
- rules)))
+ NULL,
+ rules,
+ FALSE)))
{
+ /* We don't want to hardcode our identifier here as
+ * "Pacific Standard Time", use what was passed in
+ */
+ *out_identifier = g_strdup (identifier);
+
for (i = 0; i < rules_num - 1; i++)
{
(*rules)[i].std_offset = - tzr.std_offset;
@@ -1539,7 +1549,8 @@
#elif defined (G_OS_WIN32)
if ((rules_num = rules_from_windows_time_zone (identifier,
&resolved_identifier,
- &rules)))
+ &rules,
+ TRUE)))
{
init_zone_from_rules (tz, rules, rules_num, g_steal_pointer (&resolved_identifier));
g_free (rules);
