From 39c919c85ca2c80f527e10b8f842ecda726f05fe Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Fri, 4 Feb 2005 12:18:51 +0000 Subject: clear the component preview when we update the view. 2005-02-04 Rodrigo Moya * gui/e-tasks.c (update_view): clear the component preview when we update the view. * gui/e-cal-model.c (set_instance_times): use the correct timezone. Removed commented code. svn path=/trunk/; revision=28708 --- calendar/gui/e-cal-model.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'calendar/gui/e-cal-model.c') diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 3dd68d2111..6139b3ee52 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -1303,20 +1303,19 @@ set_instance_times (ECalModelComponent *comp_data, icaltimezone *zone) if (zone) { if (e_cal_util_component_is_instance (comp_data->icalcomp)) { - comp_data->instance_start = icaltime_as_timet_with_zone (recur_time, zone); + comp_data->instance_start = icaltime_as_timet_with_zone (recur_time, + start_time.zone ? start_time.zone : zone); comp_data->instance_end = comp_data->instance_start + (icaltime_as_timet_with_zone (end_time, end_time.zone ? end_time.zone : zone) - icaltime_as_timet_with_zone (start_time, start_time.zone ? start_time.zone : zone)); } else { if (start_time.zone) { - //icaltimezone_convert_time (&start_time, start_time.zone, zone); comp_data->instance_start = icaltime_as_timet_with_zone (start_time, start_time.zone); } else comp_data->instance_start = icaltime_as_timet_with_zone (start_time, zone); if (end_time.zone) { - //icaltimezone_convert_time (&end_time, end_time.zone, zone); comp_data->instance_end = icaltime_as_timet_with_zone (end_time, end_time.zone); } else comp_data->instance_end = icaltime_as_timet_with_zone (end_time, zone); -- cgit v1.2.3