[evolution-patches] fix for the bug #322616 [calendar]

[chen <pchenthill novell com>]

Hi,
  Have attached the fix. This patch converts the end date to proper
timezone.

thanks, Chenthill.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2859
diff -u -p -r1.2859 ChangeLog
--- ChangeLog	28 Nov 2005 19:05:23 -0000	1.2859
+++ ChangeLog	29 Nov 2005 07:32:00 -0000
@@ -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
Index: gui/e-cal-model-calendar.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-calendar.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-cal-model-calendar.c
--- gui/e-cal-model-calendar.c	28 Sep 2005 10:07:34 -0000	1.21
+++ gui/e-cal-model-calendar.c	29 Nov 2005 07:32:00 -0000
@@ -116,7 +116,7 @@ get_dtend (ECalModelCalendar *model, ECa
 
 	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, ECa
 		    && 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))