Pass the parent vCalendar component as the timezone closure of

2001-07-09  Federico Mena Quintero  <federico@ximian.com>

	* pcs/cal-backend-file.c (generate_alarms_for_comp): Pass the
	parent vCalendar component as the timezone closure of
	cal_recur_generate_instances().

	* gui/dialogs/alarm-page.c (get_alarm_string): Make the string
	consistent with the option menu text.
	(get_alarm_string): Removed extra spaces from the last part of the
	alarm string.

svn path=/trunk/; revision=10961

1 files changed, 10 insertions, 1 deletions

diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c
index 06c90b79f8..11dc82e7a2 100644
--- a/calendar/pcs/cal-backend-file.c
+++ b/calendar/pcs/cal-backend-file.c
@@ -1397,6 +1397,7 @@ generate_alarms_for_comp (CalComponent *comp, time_t start, time_t end)
 	time_t alarm_start, alarm_end;
 	struct alarm_occurrence_data aod;
 	CalComponentAlarms *alarms;
+	icalcomponent *icalcomp, *vcalendar_comp;
 
 	if (!cal_component_has_alarms (comp))
 		return NULL;
@@ -1409,7 +1410,15 @@ generate_alarms_for_comp (CalComponent *comp, time_t start, time_t end)
 	aod.end = end;
 	aod.triggers = NULL;
 	aod.n_triggers = 0;
-	cal_recur_generate_instances (comp, alarm_start, alarm_end, add_alarm_occurrences_cb, &aod, resolve_tzid, NULL);
+
+	/* Get the parent VCALENDAR component, so we can resolve TZIDs.  */
+	icalcomp = cal_component_get_icalcomponent (comp);
+	vcalendar_comp = icalcomponent_get_parent (icalcomp);
+	g_assert (vcalendar_comp != NULL);
+
+	cal_recur_generate_instances (comp, alarm_start, alarm_end,
+				      add_alarm_occurrences_cb, &aod,
+				      resolve_tzid, vcalendar_comp);
 
 	/* We add the ABSOLUTE triggers separately */
 	generate_absolute_triggers (comp, &aod);