[evolution-patches] Fix for the bug #156074 [calendar]

[pchenthill <pchenthill novell com>]

Hi,
   Have attached the fix for the bug. Use the timezone present in the appointments start time.

thanks, Chenthill.


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.3011
diff -u -p -r1.3011 ChangeLog
--- ChangeLog	6 Mar 2006 15:58:53 -0000	1.3011
+++ ChangeLog	9 Mar 2006 13:30:21 -0000
@@ -1,3 +1,10 @@
+2006-03-09  Chenthill Palanisamy  <pchenthill novell com>
+
+	Fixes #156074 [b.n.c]
+	* 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
Index: gui/e-cal-model.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model.c,v
retrieving revision 1.70
diff -u -p -r1.70 e-cal-model.c
--- gui/e-cal-model.c	9 Feb 2006 11:42:40 -0000	1.70
+++ gui/e-cal-model.c	9 Mar 2006 13:30:22 -0000
@@ -2099,8 +2099,10 @@ e_cal_model_set_instance_times (ECalMode
 		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);
 }