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, 86 insertions, 0 deletions

diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
new file mode 100644
index 0000000000..d61b26a677
--- /dev/null
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -0,0 +1,86 @@
+/* Evolution calendar - Delete calendar component dialog
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * Author: Federico Mena-Quintero <federico@helixcode.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gnome.h>
+#include "delete-comp.h"
+
+
+
+/**
+ * delete_component_dialog:
+ * @comp: A calendar component.
+ * 
+ * Pops up a dialog box asking the user whether he wants to delete a particular
+ * calendar component.
+ * 
+ * Return value: TRUE if the user clicked Yes, FALSE otherwise.
+ **/
+gboolean
+delete_component_dialog (CalComponent *comp)
+{
+	CalComponentText summary;
+	CalComponentVType vtype;
+	char *str;
+	char *type;
+	GtkWidget *dialog;
+
+	g_return_val_if_fail (comp != NULL, FALSE);
+	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
+
+	vtype = cal_component_get_vtype (comp);
+	cal_component_get_summary (comp, &summary);
+
+	switch (vtype) {
+	case CAL_COMPONENT_EVENT:
+		type = _("appointment");
+		break;
+
+	case CAL_COMPONENT_TODO:
+		type = _("task");
+		break;
+
+	case CAL_COMPONENT_JOURNAL:
+		type = _("journal entry");
+		break;
+
+	default:
+		g_message ("delete_component_dialog(): Cannot handle object of type %d", vtype);
+		return FALSE;
+	}
+
+	if (summary.value)
+		str = g_strdup_printf (_("Are you sure you want to delete the %s `%s'?"),
+				       type, summary.value);
+	else
+		str = g_strdup_printf (_("Are you sure you want to delete this %s?"), type);
+
+	dialog = gnome_question_dialog_modal (str, NULL, NULL);
+	g_free (str);
+
+	if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES)
+		return TRUE;
+	else
+		return FALSE;
+}