Fixes bug #920.

2000-12-06  Federico Mena Quintero  <federico@helixcode.com>

	Fixes bug #920.

	* gui/e-calendar-table.c (delete_component): New function.
	(e_calendar_table_on_delete_task): Use delete_component().
	(e_calendar_table_on_key_press): Likewise.  Also, mark the event
	as handled.

	* gui/calendar-model.c (calendar_model_get_component): Renamed
	function from calendar_model_get_cal_object().
	(calendar_model_delete_task): Removed function.

	* gui/dialogs/delete-comp.[ch]: New files with the dialog for
	deleting a calendar component.

	* gui/e-day-view.c (e_day_view_on_delete_appointment): Confirm
	before actually deleting the appointment.

	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.

	* gui/dialogs/Makefile.am (libcal_dialogs_a_SOURCES): Added
	delete-comp.[ch] to the list of sources.

	* cal-util/cal-component.c (cal_component_destroy): Free the alarm
	UID hash.

svn path=/trunk/; revision=6828

1 files changed, 10 insertions, 29 deletions

diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index 2de745727e..8de4ab2e09 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -1854,33 +1854,6 @@ calendar_model_set_cal_client (CalendarModel *model, CalClient *client, CalObjTy
 
 
 void
-calendar_model_delete_task (CalendarModel *model,
-			    gint row)
-{
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-	const char *uid;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	priv = model->priv;
-
-	g_return_if_fail (row >= 0 && row < priv->objects->len);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	cal_component_get_uid (comp, &uid);
-
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (priv->client, uid);
-}
-
-
-void
 calendar_model_mark_task_complete (CalendarModel *model,
 				   gint row)
 {
@@ -1904,9 +1877,17 @@ calendar_model_mark_task_complete (CalendarModel *model,
 }
 
 
-/* Frees the objects stored in the calendar model */
+/**
+ * calendar_model_get_component:
+ * @model: A calendar model.
+ * @row: Row number of sought calendar component.
+ * 
+ * Queries a calendar component from a calendar model based on its row number.
+ * 
+ * Return value: The sought calendar component.
+ **/
 CalComponent *
-calendar_model_get_cal_object (CalendarModel *model,
+calendar_model_get_component (CalendarModel *model,
 			       gint	      row)
 {
 	CalendarModelPrivate *priv;