diff options
| author | Christian Neumair <cneumair@src.gnome.org> | 2005-10-18 15:56:39 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2005-10-18 15:56:39 +0000 |
| commit | 61676b11547b4125d503a73ed8cc9f57091c4297 (patch) | |
| tree | 9510ec56a53e136e215a913b0e794c80ea671e9f | |
| parent | db3431e5fa4993d8f47918b5a238bf49bf7a32a0 (diff) | |
| download | nautilus-61676b11547b4125d503a73ed8cc9f57091c4297.tar.gz | |
Don't request confirmation for deletion of "burn:" URIs. Fixes #302607.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 21 |
2 files changed, 29 insertions, 0 deletions
@@ -1,5 +1,13 @@ 2005-10-18 Christian Neumair <chris@gnome-de.org> + * 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 <chris@gnome-de.org> + * src/nautilus-places-sidebar.c: (update_places): * src/nautilus-window-bookmarks.c: (update_bookmarks): Skip nonexistant bookmarks in menus/sidebar. Fixes #312507. 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, @@ -833,6 +834,22 @@ action_trash_callback (GtkAction *action, } 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\"?"), |