diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-11-14 13:25:12 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-11-14 13:25:12 +0000 |
| commit | cc944ab98e1f2871a2fa396a705d3a4e4a66f5b7 (patch) | |
| tree | d08764b72a27c9fb9ffe2dcdfc14d95411335864 | |
| parent | 826193dab21260d33c942bf80698eee2cacf94f8 (diff) | |
| download | nautilus-cc944ab98e1f2871a2fa396a705d3a4e4a66f5b7.tar.gz | |
Add skip all button. (#48331) Patch from Guillaume Desmottes
2005-11-14 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-operations.c:
(handle_transfer_overwrite):
Add skip all button. (#48331)
Patch from Guillaume Desmottes <cass@skynet.be>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 8 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2005-11-14 Alexander Larsson <alexl@redhat.com> + + * libnautilus-private/nautilus-file-operations.c: + (handle_transfer_overwrite): + Add skip all button. (#48331) + Patch from Guillaume Desmottes <cass@skynet.be> + 2005-11-13 Christian Neumair <chris@gnome-de.org> * libnautilus-private/nautilus-icon-container.c: diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index f0c56da7e..325f0821e 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -1145,20 +1145,22 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info, (parent_for_error_dialog (transfer_info), TRUE, GTK_MESSAGE_QUESTION, text, secondary_text, _("Conflict While Copying"), - _("Replace _All"), _("_Skip"), _("_Replace"), NULL); + _("S_kip All"), _("Replace _All"), _("_Skip"), _("_Replace"), NULL); g_free (text); nautilus_file_operations_progress_resume_timeout (transfer_info->progress_dialog); switch (result) { case 0: - return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE_ALL; + return GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP_ALL; case 1: + return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE_ALL; + case 2: return GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP; default: g_assert_not_reached (); /* fall through */ - case 2: + case 3: return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE; } } |