diff options
-rw-r--r-- | calendar/ChangeLog | 5 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-editor.c | 18 |
2 files changed, 16 insertions, 7 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d2e9d64224..cb3c6d3785 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2001-01-21 Federico Mena Quintero <federico@ximian.com> + + * gui/dialogs/task-editor.c (file_delete_cb): Fix bug #1250; now + we present a confirmation dialog before deleting the component. + 2001-01-20 Federico Mena Quintero <federico@ximian.com> * gui/event-editor-dialog.glade: Fix bug #1243. Turn on the Y diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 571f9917ef..74849a66d4 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -37,6 +37,7 @@ #include <e-util/e-dialog-widgets.h> #include <widgets/misc/e-dateedit.h> #include <cal-util/timeutil.h> +#include "delete-comp.h" #include "task-editor.h" #include "../calendar-config.h" #include "../widget-util.h" @@ -1052,7 +1053,6 @@ file_delete_cb (BonoboUIComponent *uic, gpointer data, const char *path) { TaskEditor *tedit; TaskEditorPrivate *priv; - const char *uid; tedit = TASK_EDITOR (data); @@ -1062,14 +1062,18 @@ file_delete_cb (BonoboUIComponent *uic, gpointer data, const char *path) g_return_if_fail (priv->comp); - cal_component_get_uid (priv->comp, &uid); + if (delete_component_dialog (priv->comp, priv->app)) { + 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 (tedit); + /* 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 (tedit); + } } /* File/Close callback */ |