aboutsummaryrefslogtreecommitdiffstats
path: root/libical/src
diff options
context:
space:
mode:
authorDamon Chaplin <damon@ximian.com>2001-07-27 05:43:39 +0800
committerDamon Chaplin <damon@src.gnome.org>2001-07-27 05:43:39 +0800
commit4d50dc146da24f46605468b30575e275b241bfa8 (patch)
tree255398d7d1ccca34dd0fb17baaab074ddc35544b /libical/src
parent4eb5c51d15448fe19cb2c2f4ada321312514f901 (diff)
downloadgsoc2013-evolution-4d50dc146da24f46605468b30575e275b241bfa8.tar.gz
gsoc2013-evolution-4d50dc146da24f46605468b30575e275b241bfa8.tar.zst
gsoc2013-evolution-4d50dc146da24f46605468b30575e275b241bfa8.zip
if from_zone is NULL (i.e. it is a floating time), just return.
2001-07-26 Damon Chaplin <damon@ximian.com> * 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
Diffstat (limited to 'libical/src')
-rw-r--r--libical/src/libical/icaltimezone.c6
1 files changed, 3 insertions, 3 deletions
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. */