From 4d50dc146da24f46605468b30575e275b241bfa8 Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Thu, 26 Jul 2001 21:43:39 +0000 Subject: if from_zone is NULL (i.e. it is a floating time), just return. 2001-07-26 Damon Chaplin * src/libical/icaltimezone.c (icaltimezone_convert_time): if from_zone is NULL (i.e. it is a floating time), just return. svn path=/trunk/; revision=11435 --- libical/src/libical/icaltimezone.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libical/src') diff --git a/libical/src/libical/icaltimezone.c b/libical/src/libical/icaltimezone.c index ca91d881da..3837888173 100644 --- a/libical/src/libical/icaltimezone.c +++ b/libical/src/libical/icaltimezone.c @@ -731,9 +731,9 @@ icaltimezone_convert_time (struct icaltimetype *tt, { int utc_offset, is_daylight; - /* If the time is a DATE value or both timezones are the same, we don't - need to do anything. */ - if (tt->is_date || from_zone == to_zone) + /* If the time is a DATE value or both timezones are the same, or we are + converting a floating time, we don't need to do anything. */ + if (tt->is_date || from_zone == to_zone || from_zone == NULL) return; /* Convert the time to UTC by getting the UTC offset and subtracting it. */ -- cgit v1.2.3