aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/e-cal-model.c
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@novell.com>2005-02-04 20:18:51 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2005-02-04 20:18:51 +0800
commit39c919c85ca2c80f527e10b8f842ecda726f05fe (patch)
treeea19f3cb5dcca82245d7f36a2af836518d16179d /calendar/gui/e-cal-model.c
parent958515a10ad2c5fd363381fed9a317c29433a04d (diff)
downloadgsoc2013-evolution-39c919c85ca2c80f527e10b8f842ecda726f05fe.tar
gsoc2013-evolution-39c919c85ca2c80f527e10b8f842ecda726f05fe.tar.gz
gsoc2013-evolution-39c919c85ca2c80f527e10b8f842ecda726f05fe.tar.bz2
gsoc2013-evolution-39c919c85ca2c80f527e10b8f842ecda726f05fe.tar.lz
gsoc2013-evolution-39c919c85ca2c80f527e10b8f842ecda726f05fe.tar.xz
gsoc2013-evolution-39c919c85ca2c80f527e10b8f842ecda726f05fe.tar.zst
gsoc2013-evolution-39c919c85ca2c80f527e10b8f842ecda726f05fe.zip
clear the component preview when we update the view.
2005-02-04 Rodrigo Moya <rodrigo@novell.com> * 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
Diffstat (limited to 'calendar/gui/e-cal-model.c')
-rw-r--r--calendar/gui/e-cal-model.c5
1 files changed, 2 insertions, 3 deletions
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);