From 750c920dcdce2d34d7f9bce228ff897024808f26 Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Thu, 25 Oct 2001 23:27:47 +0000 Subject: Outlooks (2000) places "Standard Time" and "Daylight Time" in the TZNAME 2001-10-25 Damon Chaplin * 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) svn path=/trunk/; revision=14107 --- libical/src/libical/icaltimezone.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libical/src') 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) { -- cgit v1.2.3