diff options
| author | Chenthill Palanisamy <pchen@src.gnome.org> | 2006-03-13 13:34:08 +0800 |
|---|---|---|
| committer | Chenthill Palanisamy <pchen@src.gnome.org> | 2006-03-13 13:34:08 +0800 |
| commit | 6400338f01d57280cb6108eb3bda4af8dff7ba78 (patch) | |
| tree | 87c880a31c10165734a56eb6e9f2e1b049cb35c4 /calendar | |
| parent | 858ae5ff7d89f5b5ea338ebaab3d614d9ed6ee57 (diff) | |
| download | gsoc2013-evolution-6400338f01d57280cb6108eb3bda4af8dff7ba78.tar gsoc2013-evolution-6400338f01d57280cb6108eb3bda4af8dff7ba78.tar.gz gsoc2013-evolution-6400338f01d57280cb6108eb3bda4af8dff7ba78.tar.bz2 gsoc2013-evolution-6400338f01d57280cb6108eb3bda4af8dff7ba78.tar.lz gsoc2013-evolution-6400338f01d57280cb6108eb3bda4af8dff7ba78.tar.xz gsoc2013-evolution-6400338f01d57280cb6108eb3bda4af8dff7ba78.tar.zst gsoc2013-evolution-6400338f01d57280cb6108eb3bda4af8dff7ba78.zip | |
Fixes #334003
svn path=/trunk/; revision=31704
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/e-cal-model.c | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index fc24a6bd1f..fd4864ca30 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2006-03-09 Chenthill Palanisamy <pchenthill@novell.com> + + Fixes #334003 + * gui/e-cal-model.c: + (e_cal_model_set_instance_times): Use the timezone present in + the appointment. + 2006-03-06 Veerapuram Varadhan <vvaradhan@novell.com> **Fixes #321832 diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index c3380d0cef..3ef8ba6e47 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -2099,8 +2099,10 @@ e_cal_model_set_instance_times (ECalModelComponent *comp_data, icaltimezone *zon icalcomponent_set_dtend (comp_data->icalcomp, end_time); } + if (start_time.zone) + zone = start_time.zone; + comp_data->instance_start = icaltime_as_timet_with_zone (start_time, zone); - comp_data->instance_end = comp_data->instance_start + - (icaltime_as_timet_with_zone (end_time, zone) - icaltime_as_timet_with_zone (start_time, zone)); + comp_data->instance_end = icaltime_as_timet_with_zone (end_time, zone); } |