aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamon Chaplin <damon@ximian.com>2001-11-14 07:35:16 +0800
committerDamon Chaplin <damon@src.gnome.org>2001-11-14 07:35:16 +0800
commitb93c623212899977f4f45db41ae171c64a42c62f (patch)
tree868d961f296ff74081a9775c10f852b1312f3d4b
parent77b4c60a69f9ce442e3efffa416045305d9de764 (diff)
downloadgsoc2013-evolution-b93c623212899977f4f45db41ae171c64a42c62f.tar.gz
gsoc2013-evolution-b93c623212899977f4f45db41ae171c64a42c62f.tar.zst
gsoc2013-evolution-b93c623212899977f4f45db41ae171c64a42c62f.zip
initialize the builtin timezones, to ensure that the TZID of the UTC zone
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. svn path=/trunk/; revision=14689
-rw-r--r--libical/ChangeLog6
-rw-r--r--libical/src/libical/icaltimezone.c5
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);