diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/event-editor.c | 18 |
2 files changed, 17 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 1d99df64b0..db57fe6d09 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,4 +1,9 @@ -2000-12-06 <purify@the-dot-in.helixcode.com> +2000-12-06 Federico Mena Quintero <federico@helixcode.com> + + * gui/event-editor.c (file_delete_cb): Confirm before deleting the + event. + +2000-12-06 JP Rosevear <jpr@helixcode.com> * gui/e-week-view.c (e_week_view_init): unref the pixbuf when finished with it diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c index 139ce84efa..97daa77fce 100644 --- a/calendar/gui/event-editor.c +++ b/calendar/gui/event-editor.c @@ -30,6 +30,7 @@ #include <widgets/misc/e-dateedit.h> #include <gal/widgets/e-unicode.h> #include <cal-util/timeutil.h> +#include "dialogs/delete-comp.h" #include "calendar-config.h" #include "event-editor.h" #include "e-meeting-edit.h" @@ -2309,7 +2310,6 @@ file_delete_cb (GtkWidget *widget, gpointer data) { EventEditor *ee; EventEditorPrivate *priv; - const char *uid; ee = EVENT_EDITOR (data); @@ -2319,14 +2319,18 @@ file_delete_cb (GtkWidget *widget, gpointer data) g_return_if_fail (priv->comp); - cal_component_get_uid (priv->comp, &uid); + if (delete_component_dialog (priv->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 (priv->client, uid); + cal_component_get_uid (priv->comp, &uid); - close_dialog (ee); + /* 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); + + close_dialog (ee); + } } /* File/Close callback */ |