Requesting approval for commiting a patch for gnome-2-14 branch

[pchenthill <pchenthill novell com>]

Hi,
   This is a fix for the bug http://bugzilla.gnome.org/show_bug.cgi?id=334003. Have attached the approved mail and the patch. This has been approved by the Evolution Shell Maintainer.  The patch has been tested by both of us. This does not involve UI or String Freeze breaks.

thanks, Chenthill.

--- Begin Message ---

• From: Srinivasa Ragavan <sragavan novell com>
• To: pchenthill <pchenthill novell com>
• Cc: patches <evolution-patches gnome org>
• Subject: Re: [evolution-patches] Fix for the bug #156074 [calendar]
• Date: Fri, 10 Mar 2006 11:55:49 +0530

Chen the patch looks OK. I think this has to be commited to gnome-2-14
and HEAD.  Please send a approval to release team for breaking the
freeze and then proceed.

The right bug id is 334003.

Thanks for a quick fix :)
-Srini
On Thu, 2006-03-09 at 19:15 +0530, pchenthill wrote:
> Hi,
>    Have attached the fix for the bug. Use the timezone present in the
> appointments start time.
> 
> thanks, Chenthill. 
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches gnome org
> http://mail.gnome.org/mailman/listinfo/evolution-patches

--- End Message ---

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);
 }