diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-12-12 10:00:12 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-12-12 10:00:12 +0000 |
| commit | f03608b0904ed20850e7ba49d397a7d41330a298 (patch) | |
| tree | ab3ffd56f2f2bd8bf5e97379adcad149ed329e0e | |
| parent | 146945c1588f62cb86145cae73568a43519cc974 (diff) | |
| download | nautilus-NAUTILUS_SEARCH2_MERGE_ANCHOR2.tar.gz | |
Don't ask to move broken symlinks to trash in trash (#132751)NAUTILUS_SEARCH2_MERGE_ANCHOR2
2005-12-12 Alexander Larsson <alexl@redhat.com>
* src/file-manager/fm-directory-view.c:
(report_broken_symbolic_link):
Don't ask to move broken symlinks to trash in trash (#132751)
Patch from Christian Neumair
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 18 |
2 files changed, 25 insertions, 1 deletions
@@ -1,5 +1,13 @@ 2005-12-12 Alexander Larsson <alexl@redhat.com> + * src/file-manager/fm-directory-view.c: + (report_broken_symbolic_link): + Don't ask to move broken symlinks to trash in trash (#132751) + + Patch from Christian Neumair + +2005-12-12 Alexander Larsson <alexl@redhat.com> + * libnautilus-private/nautilus-desktop-icon-file.c: * libnautilus-private/nautilus-directory-async.c: * libnautilus-private/nautilus-file.c: diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 50ae4b1c7..8b97f5b83 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -7390,6 +7390,7 @@ static void report_broken_symbolic_link (FMDirectoryView *view, NautilusFile *file) { char *target_path; + char *display_name; char *prompt; char *detail; GtkDialog *dialog; @@ -7398,14 +7399,27 @@ report_broken_symbolic_link (FMDirectoryView *view, NautilusFile *file) g_assert (nautilus_file_is_broken_symbolic_link (file)); + display_name = nautilus_file_get_display_name (file); + if (nautilus_file_is_in_trash (file)) { + prompt = g_strdup_printf (_("The Link \"%s\" is Broken."), display_name); + } else { + prompt = g_strdup_printf (_("The Link \"%s\" is Broken. Move it to Trash?"), display_name); + } + g_free (display_name); + target_path = nautilus_file_get_symbolic_link_target_path (file); - prompt = _("The link is broken, do you want to move it to the Trash?"); if (target_path == NULL) { detail = g_strdup (_("This link can't be used, because it has no target.")); } else { detail = g_strdup_printf (_("This link can't be used, because its target " "\"%s\" doesn't exist."), target_path); } + + if (nautilus_file_is_in_trash (file)) { + eel_run_simple_dialog (GTK_WIDGET (view), FALSE, GTK_MESSAGE_WARNING, + prompt, detail, "", GTK_STOCK_CANCEL, NULL); + goto out; + } dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), GTK_STOCK_CANCEL, fm_directory_view_get_containing_window (view)); @@ -7431,6 +7445,8 @@ report_broken_symbolic_link (FMDirectoryView *view, NautilusFile *file) trash_or_delete_files (view, &file_as_list); } +out: + g_free (prompt); g_free (target_path); g_free (detail); } |