diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-03-28 12:16:52 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-03-28 12:16:52 +0000 |
| commit | 0f08a09f945f4dd2df525714a644c11559a7aff3 (patch) | |
| tree | e5058c696a459624c575de57a671a17c7b6c8432 /libnautilus-private | |
| parent | a2f699e5f64d1bee15945f78852854c9f13f7091 (diff) | |
| download | nautilus-0f08a09f945f4dd2df525714a644c11559a7aff3.tar.gz | |
Make sure to queue a move even if the op was a move, not just an added
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.
svn path=/trunk/; revision=13989
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index e67278b61..fb45c049c 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -3275,7 +3275,11 @@ copy_move_file (CopyMoveJob *copy_job, 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 @@ copy_move_file (CopyMoveJob *copy_job, 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 @@ nautilus_file_operations_move (GList *files, 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 |