callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #322616

Browse Source 
svn path=/trunk/; revision=30704
This commit is contained in:
Chenthill Palanisamy
2005-11-29 08:15:08 +00:00
parent 32ba5f5d60
commit d945a55a5f
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/ChangeLog
View File

@ -1,3 +1,9 @@
2005-11-29 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #322616
* gui/e-cal-model-calendar.c: (get_dtend): Convert to
proper time zone.
2005-11-28 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #317322

9
calendar/gui/e-cal-model-calendar.c
View File

@ -116,7 +116,7 @@ get_dtend (ECalModelCalendar *model, ECalModelComponent *comp_data)
if (!comp_data->dtend) {
icalproperty *prop;
icaltimezone *zone, *model_zone;
icaltimezone *zone = NULL, *model_zone = NULL;
gboolean got_zone = FALSE;
prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTEND_PROPERTY);
@ -129,13 +129,16 @@ get_dtend (ECalModelCalendar *model, ECalModelComponent *comp_data)
&& e_cal_get_timezone (comp_data->client, icaltime_get_tzid (tt_end), &zone, NULL))
got_zone = TRUE;
model_zone = e_cal_model_get_timezone (E_CAL_MODEL (model));
if (e_cal_model_get_flags (E_CAL_MODEL (model)) & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES) {
if (got_zone) {
tt_end = icaltime_from_timet_with_zone (comp_data->instance_end, tt_end.is_date, zone);
if ((model_zone = e_cal_model_get_timezone (E_CAL_MODEL (model))))
if (model_zone)
icaltimezone_convert_time (&tt_end, zone, model_zone);
} else
tt_end = icaltime_from_timet (comp_data->instance_end, tt_end.is_date);
tt_end = icaltime_from_timet_with_zone (comp_data->instance_end, tt_end.is_date,
model_zone);
}
if (!icaltime_is_valid_time (tt_end) || icaltime_is_null_time (tt_end))