nautilus r13989 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Fri Mar 28 12:16:52 2008
New Revision: 13989
URL: http://svn.gnome.org/viewvc/nautilus?rev=13989&view=rev

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

        * libnautilus-private/nautilus-file-operations.c:
        (copy_move_file):
	Make sure to queue a move even if the op was a move,
	not just an added event.




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 12:16:52 2008
@@ -3275,7 +3275,11 @@
 		report_copy_progress (copy_job, source_info, transfer_info);
 
 		if (debuting_files) {
-			nautilus_file_changes_queue_schedule_metadata_copy (src, dest);
+			if (copy_job->is_move) {
+				nautilus_file_changes_queue_schedule_metadata_move (src, dest);
+			} else {
+				nautilus_file_changes_queue_schedule_metadata_copy (src, dest);
+			}
 			if (position) {
 				nautilus_file_changes_queue_schedule_position_set (dest, *position, job->screen_num);
 			} else {
@@ -3284,7 +3288,11 @@
 			
 			g_hash_table_replace (debuting_files, g_object_ref (dest), GINT_TO_POINTER (TRUE));
 		}
-		nautilus_file_changes_queue_file_added (dest);
+		if (copy_job->is_move) {
+			nautilus_file_changes_queue_file_moved (src, dest);
+		} else {
+			nautilus_file_changes_queue_file_added (dest);
+		}
 		g_object_unref (dest);
 		return;
 	}
@@ -4148,10 +4156,10 @@
 	job->debuting_files = g_hash_table_new_full (g_file_hash, (GEqualFunc)g_file_equal, g_object_unref, NULL);
 
 	g_io_scheduler_push_job (move_job,
-			   job,
-			   NULL, /* destroy notify */
-			   0,
-			   job->common.cancellable);
+				 job,
+				 NULL, /* destroy notify */
+				 0,
+				 job->common.cancellable);
 }
 
 static void