From 7e35463832751ecfa20a10949eac4188a8c00125 Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Wed, 3 Oct 2001 04:34:53 +0000 Subject: save the EXDATE as a DATE-TIME value, since we know the exact time. Fixes 2001-10-03 Damon Chaplin * gui/comp-util.c (cal_comp_util_add_exdate): save the EXDATE as a DATE-TIME value, since we know the exact time. Fixes bug #11278. (Before we were setting is_date, but icaltime_from_timet_with_zone() didn't convert it properly. We need to figure out how to handle DATEs when using time_t's.) * gui/dialogs/recurrence-page.c (get_exception_string): use e_time_format_date_and_time() so we show the time as well, if the exception is a DATE-TIME value. * cal-util/timeutil.c: removed time_add_month(), time_year_begin(), time_month_begin() & time_week_begin() - old pre-timezone functions which we no longer use. * cal-util/cal-recur.c (cal_recur_from_icalproperty): set ir.until.is_date to FALSE before converting to a time_t. Hopefully fixes bug #5034. svn path=/trunk/; revision=13366 --- calendar/cal-util/cal-recur.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'calendar/cal-util/cal-recur.c') diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c index 9afcee9784..83a0bccae9 100644 --- a/calendar/cal-util/cal-recur.c +++ b/calendar/cal-util/cal-recur.c @@ -878,9 +878,14 @@ cal_recur_from_icalproperty (icalproperty *prop, gboolean exception, ir.until.hour = 23; ir.until.minute = 59; ir.until.second = 59; + ir.until.is_date = FALSE; r->enddate = icaltime_as_timet_with_zone (ir.until, zone); +#if 0 + g_print (" until: %li - %s", r->enddate, ctime (&r->enddate)); +#endif + } else { /* If UNTIL is a DATE-TIME, it must be in UTC. */ icaltimezone *utc_zone; -- cgit