aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libical/ChangeLog9
-rw-r--r--libical/src/libical/icaltimezone.c5
2 files changed, 14 insertions, 0 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index 8699fe777c..6843ea1c12 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-25 Damon Chaplin <damon@ximian.com>
+
+ * src/libical/icaltimezone.c (icaltimezone_get_tznames_from_vtimezone):
+ Outlooks (2000) places "Standard Time" and "Daylight Time" in the
+ TZNAME strings, which is useless, so return NULL in that case.
+ ETimezoneEntry will then use the TZID instead, in which Outlook does
+ place the actual timezone name. (I just hope Outlook doesn't translate
+ "Standard Time" to other languages, as we won't be able to fix it then)
+
2001-10-23 Damon Chaplin <damon@ximian.com>
* src/libical/icalrecur.c (icalrecur_two_byrule): use
diff --git a/libical/src/libical/icaltimezone.c b/libical/src/libical/icaltimezone.c
index b36e34eb74..9e15fbf993 100644
--- a/libical/src/libical/icaltimezone.c
+++ b/libical/src/libical/icaltimezone.c
@@ -387,6 +387,11 @@ icaltimezone_get_tznames_from_vtimezone (icalcomponent *component)
ICAL_ANY_COMPONENT);
}
+ /* Outlook (2000) places "Standard Time" and "Daylight Time" in the TZNAME
+ strings, which is totally useless. So we return NULL in that case. */
+ if (standard_tzname && !strcmp (standard_tzname, "Standard Time"))
+ return NULL;
+
/* If both standard and daylight TZNAMEs were found, if they are the same
we return just one, else we format them like "EST/EDT". */
if (standard_tzname && daylight_tzname) {