diff options
| author | Alexander Larsson <alexl@redhat.com> | 2003-12-11 12:17:35 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2003-12-11 12:17:35 +0000 |
| commit | 4aa5ada4bd83bd649534e84e57218d2ac15625c8 (patch) | |
| tree | 8c3ec023e7eadaace844626760bd5b729799eb5b /src | |
| parent | 0b04cb7f9009429fe6a02020375dfab626b2ae6f (diff) | |
| download | nautilus-4aa5ada4bd83bd649534e84e57218d2ac15625c8.tar.gz | |
Handle defaults for desktop drops like normal directories.
2003-12-11 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-dnd.c
(nautilus_drag_default_drop_action_for_icons):
Handle defaults for desktop drops like
normal directories.
* libnautilus-private/nautilus-desktop-link-monitor.c (nautilus_desktop_link_monitor_delete_link):
Don't allow deletion of standard desktop links.
* src/file-manager/fm-directory-view.c (fm_directory_view_confirm_deletion):
Don't need to confirm for desktop icons.
Diffstat (limited to 'src')
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 764e1e1ac..ee8a12677 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -3047,6 +3047,7 @@ fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean char *prompt; char *detail; int uri_count; + char *uri; char *file_name; int response; @@ -3056,7 +3057,12 @@ fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean g_assert (uri_count > 0); if (uri_count == 1) { - file_name = file_name_from_uri ((char *) uris->data); + uri = (char *) uris->data; + if (eel_uri_is_desktop (uri)) { + /* Don't ask for desktop icons */ + return TRUE; + } + file_name = file_name_from_uri (uri); prompt = _("Cannot move file to trash, do you want to delete immediately?"); detail = g_strdup_printf (_("The file \"%s\" cannot be moved to the trash."), file_name); g_free (file_name); |