Renamed the occur field to occur_start; added an occur_end field. This way

2001-06-26  Federico Mena Quintero  <federico@ximian.com>

	* idl/evolution-calendar.idl (CalAlarmInstance): Renamed the occur
	field to occur_start; added an occur_end field.  This way we can
	present the complete times for the occurrence from the server.

	* cal-util/cal-component.h (CalAlarmInstance): Likewise.

	* pcs/cal-backend-file.c (add_alarm_occurrences_cb): Fill the new
	fields appropriately.
	(generate_absolute_triggers): Likewise; we use -1 in case the
	component has no DTSTART or DTEND because there are no meaningful
	occurrence dates here.
	(fill_alarm_instances_seq): Fill in the new fields.

	* cal-client/cal-client.c (build_alarm_instance_list): Likewise.

	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):
	Take in both the occur_start and occur_end times.

	* gui/goto.c (goto_dialog): Free the dlg structure on the bail-out
	cases.

	* gui/dialogs/event-page.c (get_widgets): Do not assert if we
	cannot find the main widget; just return FALSE.

	* gui/dialogs/alarm-page.c (get_widgets): Likewise.

	* gui/dialogs/task-page.c (get_widgets): Likewise.

	* gui/dialogs/task-details-page.c (get_widgets): Likewise.

	* gui/dialogs/meeting-page.c (get_widgets): Likewise.

svn path=/trunk/; revision=10517

1 files changed, 3 insertions, 11 deletions

diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 2072e03c84..c0e66ff484 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -163,8 +163,6 @@ alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
 	CalComponent *comp;
 	GSList *l;
 	QueuedAlarm *qa;
-	const char *auid;
-	time_t occur;
 
 	cqa = data;
 	comp = cqa->alarms->comp;
@@ -181,15 +179,9 @@ alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
 
 	g_assert (qa != NULL);
 
-	/* Fetch the alarm information.  We use the trigger time passed to us
-	 * instead of the one in the instance structure because this may not be
-	 * the actual computed trigger but a snoozed one instead.
-	 */
-
-	auid = qa->instance->auid;
-	occur = qa->instance->occur;
-
-	if (!alarm_notify_dialog (trigger, occur, comp, notify_dialog_cb, comp))
+	if (!alarm_notify_dialog (trigger,
+				  qa->instance->occur_start, qa->instance->occur_end,
+				  comp, notify_dialog_cb, comp))
 		g_message ("alarm_trigger_cb(): Could not create the alarm notify dialog");
 }