[PATCH] Add "Skip All" button in copy/move conflict dialog

[Guillaume Desmottes <cass skynet be>]

Hi!

A little patch to fix bug 48331.

It's my first nautilus patch ;-)

	G.

-- 
Guillaume Desmottes <cass skynet be>
Jabber <cassidy jabber belnet be>
GPG 1024D/711E31B1 | 1B5A 1BA8 11AA F0F1 2169  E28A AC55 8671 711E 31B1

Index: libnautilus-private/nautilus-file-operations.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-file-operations.c,v
retrieving revision 1.194
diff -u -p -r1.194 nautilus-file-operations.c
--- libnautilus-private/nautilus-file-operations.c	7 Jul 2005 10:16:40 -0000	1.194
+++ libnautilus-private/nautilus-file-operations.c	4 Aug 2005 23:27:43 -0000
@@ -1143,21 +1143,23 @@ handle_transfer_overwrite (const GnomeVF
 			(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;
+		case 3:
+			return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE;
 		default:
 			g_assert_not_reached ();
 			/* fall through */
-		case 2:
-			return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE;
 		}
 	}
 }

Attachment: signature.asc
Description: This is a digitally signed message part