diff options
| -rw-r--r-- | libical/ChangeLog | 6 | ||||
| -rw-r--r-- | libical/src/libical/icaltimezone.c | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog index b00c82defe..1ed7a708b1 100644 --- a/libical/ChangeLog +++ b/libical/ChangeLog @@ -1,3 +1,9 @@ +2001-11-13 Damon Chaplin <damon@ximian.com> + + * src/libical/icaltimezone.c (icaltimezone_get_tzid): initialize the + builtin timezones, to ensure that the TZID of the UTC zone is set. + Hopefully fixes bugs #14941 & #14622. + 2001-10-31 Damon Chaplin <damon@ximian.com> * src/libical/icalproperty.c (get_next_line_start): use MAX_LINE_LEN diff --git a/libical/src/libical/icaltimezone.c b/libical/src/libical/icaltimezone.c index f7d62a3383..f2e33d3596 100644 --- a/libical/src/libical/icaltimezone.c +++ b/libical/src/libical/icaltimezone.c @@ -1120,6 +1120,11 @@ icaltimezone_get_tzid (icaltimezone *zone) if (!zone) return NULL; + /* Initialize the builtin timezones, to ensure that the UTC timezone has + its TZID set. */ + if (!builtin_timezones) + icaltimezone_init_builtin_timezones (); + if (!zone->component) icaltimezone_load_builtin_timezone (zone); |