diff options
| -rw-r--r-- | libical/ChangeLog | 5 | ||||
| -rw-r--r-- | libical/src/libical/icaltimezone.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog index 115c47239d..fad93e3f52 100644 --- a/libical/ChangeLog +++ b/libical/ChangeLog @@ -1,3 +1,8 @@ +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. + 2001-07-25 Damon Chaplin <damon@ximian.com> * src/libical/icaltimezone.c: accept an icaltimezone* of NULL for all 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. */ |