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, 6 deletions

diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 6968d5ec81..e6d0546b96 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -31,6 +31,7 @@
 #include <gnome.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
+#include "dialogs/delete-comp.h"
 #include "calendar-commands.h"
 #include "comp-util.h"
 #include "e-week-view.h"
@@ -3311,7 +3312,6 @@ e_week_view_on_delete_appointment (GtkWidget *widget, gpointer data)
 {
 	EWeekView *week_view;
 	EWeekViewEvent *event;
-	const char *uid;
 
 	week_view = E_WEEK_VIEW (data);
 
@@ -3321,12 +3321,16 @@ e_week_view_on_delete_appointment (GtkWidget *widget, gpointer data)
 	event = &g_array_index (week_view->events, EWeekViewEvent,
 				week_view->popup_event_num);
 
-	cal_component_get_uid (event->comp, &uid);
+	if (delete_component_dialog (event->comp)) {
+		const char *uid;
 
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (week_view->client, uid);
+		cal_component_get_uid (event->comp, &uid);
+
+		/* We don't check the return value; FALSE can mean the object
+		 * was not in the server anyways.
+		 */
+		cal_client_remove_object (week_view->client, uid);
+	}
 }