[nautilus/merge_replace_dialog: 13/23] Fix a conflict after rebase.
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/merge_replace_dialog: 13/23] Fix a conflict after rebase.
- Date: Fri, 9 Apr 2010 01:41:56 +0000 (UTC)
commit 2fe1f941e98bb78d7097e38fec3431e1a4084420
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Thu Apr 8 17:26:29 2010 +0200
Fix a conflict after rebase.
libnautilus-private/nautilus-file-operations.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 05cad3e..26bcb2c 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -4681,7 +4681,6 @@ move_file_prepare (CopyMoveJob *move_job,
}
nautilus_file_changes_queue_file_moved (src, dest);
- nautilus_file_changes_queue_schedule_metadata_move (src, dest);
if (position) {
nautilus_file_changes_queue_schedule_position_set (dest, *position, job->screen_num);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]