? depcomp
? stamp-h1
? libnautilus-private/nautilus-file-operations.c.patched
? po/stamp-it
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.6740
diff -u -d -r1.6740 ChangeLog
--- ChangeLog	17 Dec 2005 00:16:09 -0000	1.6740
+++ ChangeLog	17 Dec 2005 12:46:59 -0000
@@ -1,3 +1,10 @@
+2005-12-17  Claudio Saavedra  <csaavedra@alumnos.utalca.cl>
+
+	* libnautilus-private/nautilus-file-operations.c:
+	(handle_transfer_overwrite): Correctly handling user answer to 
+	overwrite or skip files. Removing extra unused button. Fixes
+	bug #324331.
+
 2005-12-16  Dennis Cranston  <dennis_cranston@yahoo.com>
  
  	* libnautilus-private/nautilus-dnd.c:
Index: libnautilus-private/nautilus-file-operations.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-file-operations.c,v
retrieving revision 1.202
diff -u -d -r1.202 nautilus-file-operations.c
--- libnautilus-private/nautilus-file-operations.c	9 Dec 2005 14:35:32 -0000	1.202
+++ libnautilus-private/nautilus-file-operations.c	17 Dec 2005 12:46:59 -0000
@@ -1183,7 +1183,6 @@
 			 GTK_MESSAGE_QUESTION, 
 			 text, 
 			 secondary_text, 
-			 _("Conflict While Copying"),
 			 _("_Skip"), _("_Replace"), NULL);
 		g_free (text);	 
 
@@ -1192,17 +1191,16 @@
 		switch (result) {
 		case 0:
 			return GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP;
+		case 1:
+			return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE;
 		default:
 			g_assert_not_reached ();
 			/* fall through */
-		case 1:
-			return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE;
 		}
 	} else {
 		result = eel_run_simple_dialog
 			(parent_for_error_dialog (transfer_info), TRUE, GTK_MESSAGE_QUESTION, text, 
 			 secondary_text, 
-			 _("Conflict While Copying"),
 			 _("S_kip All"), _("Replace _All"), _("_Skip"), _("_Replace"), NULL);
 		g_free (text);
 
@@ -1215,11 +1213,11 @@
 			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 3:
-			return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE;
 		}
 	}
 }
