aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 641f590684..72bf0f20ea 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,10 @@
2001-07-27 JP Rosevear <jpr@ximian.com>
+ * conduits/calendar/calendar-conduit.c (local_record_from_comp):
+ recur is always in UTC
+
+2001-07-27 JP Rosevear <jpr@ximian.com>
+
* conduits/calendar/calendar-conduit.c: handle timezones
everywhere
(get_timezone): new function to get a timezone based
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 38c5758090..823f1a8021 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -529,7 +529,7 @@ local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitC
local->appt->repeatForever = 1;
} else {
local->appt->repeatForever = 0;
- dt_time = icaltime_as_timet_with_zone (recur->until, ctxt->timezone);
+ dt_time = icaltime_as_timet (recur->until);
local->appt->repeatEnd = *localtime (&dt_time);
}