nautilus r13985 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Fri Mar 28 09:34:11 2008
New Revision: 13985
URL: http://svn.gnome.org/viewvc/nautilus?rev=13985&view=rev

Log:
2008-03-28  Alexander Larsson  <alexl redhat com>

        * libnautilus-private/nautilus-file-operations.c:
        (move_file_prepare):
	Actually handle the move-file-over-directory case.



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-file-operations.c

Modified: trunk/libnautilus-private/nautilus-file-operations.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file-operations.c	(original)
+++ trunk/libnautilus-private/nautilus-file-operations.c	Fri Mar 28 09:34:11 2008
@@ -3835,12 +3835,27 @@
 			error = NULL;
 		}
 
+		/* TODO: Handle delete dest */
+		
 		*copy_files = g_list_prepend (*copy_files, src);
 		if (position) {
 			g_array_append_val (copy_positions, *position);
 		}
 	}
 
+	else if (overwrite &&
+		 IS_IO_ERROR (error, IS_DIRECTORY)) {
+
+		g_error_free (error);
+
+		/* TODO delete_dest is TRUE here  */
+		
+		*copy_files = g_list_prepend (*copy_files, src);
+		if (position) {
+			g_array_append_val (copy_positions, *position);
+		}
+	}
+	
 	else if (IS_IO_ERROR (error, CANCELLED)) {
 		g_error_free (error);
 	}