From cc944ab98e1f2871a2fa396a705d3a4e4a66f5b7 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 14 Nov 2005 13:25:12 +0000 Subject: [PATCH] Add skip all button. (#48331) Patch from Guillaume Desmottes 2005-11-14 Alexander Larsson * libnautilus-private/nautilus-file-operations.c: (handle_transfer_overwrite): Add skip all button. (#48331) Patch from Guillaume Desmottes --- ChangeLog | 7 +++++++ libnautilus-private/nautilus-file-operations.c | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index db5e99bc5..3304c1f04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-11-14 Alexander Larsson + + * libnautilus-private/nautilus-file-operations.c: + (handle_transfer_overwrite): + Add skip all button. (#48331) + Patch from Guillaume Desmottes + 2005-11-13 Christian Neumair * 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; } }