From 61676b11547b4125d503a73ed8cc9f57091c4297 Mon Sep 17 00:00:00 2001 From: Christian Neumair Date: Tue, 18 Oct 2005 15:56:39 +0000 Subject: Don't request confirmation for deletion of "burn:" URIs. Fixes #302607. --- ChangeLog | 8 ++++++++ src/file-manager/fm-directory-view.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4aa7502ca..2a94cf600 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-10-18 Christian Neumair + + * src/file-manager/fm-directory-view.c: + (can_delete_uri_without_confirm), + (confirm_delete_directly): + Don't request confirmation for deletion of "burn:" URIs. Fixes + #302607. + 2005-10-18 Christian Neumair * src/nautilus-places-sidebar.c: (update_places): diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 798b7b508..5692e9bd1 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -348,6 +348,7 @@ static void activate_activation_uri_ready_callback (NautilusFile gpointer callback_data); static gboolean can_show_default_app (FMDirectoryView *view, NautilusFile *file); +static gboolean can_delete_uri_without_confirm (const char *uri); static gboolean activate_check_mime_types (FMDirectoryView *view, NautilusFile *file, @@ -832,6 +833,22 @@ action_trash_callback (GtkAction *action, trash_or_delete_selected_files (FM_DIRECTORY_VIEW (callback_data)); } +static gboolean +can_delete_uris_without_confirm (GList *uris) +{ + g_assert (uris != NULL); + + while (uris != NULL) { + if (!can_delete_uri_without_confirm (uris->data)) { + return FALSE; + } + + uris = uris->next; + } + + return TRUE; +} + static gboolean confirm_delete_directly (FMDirectoryView *view, GList *uris) @@ -852,6 +869,10 @@ confirm_delete_directly (FMDirectoryView *view, uri_count = g_list_length (uris); g_assert (uri_count > 0); + if (can_delete_uris_without_confirm (uris)) { + return TRUE; + } + if (uri_count == 1) { file_name = file_name_from_uri ((char *) uris->data); prompt = g_strdup_printf (_("Are you sure you want to permanently delete \"%s\"?"), -- cgit v1.2.1