summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wehner <martin.wehner@epost.de>2004-01-02 08:12:07 +0000
committerMartin Wehner <mwehner@src.gnome.org>2004-01-02 08:12:07 +0000
commit6b7d84f95d809d1fa3edc4da7a8a8bd3424d3192 (patch)
tree1481b488398e6b433f1a2f6f88e646461c9eaf11
parent5dacfa35bbfe7c9b6e057c06cabfff110cef36b1 (diff)
downloadnautilus-6b7d84f95d809d1fa3edc4da7a8a8bd3424d3192.tar.gz
Ensure the source isn't deleted as partial copy in a duplicate operation.
2004-01-02 Martin Wehner <martin.wehner@epost.de> * libnautilus-private/nautilus-file-operations.c: Ensure the source isn't deleted as partial copy in a duplicate operation. Fixes bug #128095.
-rw-r--r--ChangeLog6
-rw-r--r--libnautilus-private/nautilus-file-operations.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d583ee3cc..4457844ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-02 Martin Wehner <martin.wehner@epost.de>
+
+ * libnautilus-private/nautilus-file-operations.c:
+ Ensure the source isn't deleted as partial copy
+ in a duplicate operation. Fixes bug #128095.
+
2003-11-20 Dave Camp <dave@ximian.com>
* src/file-manager/fm-list-view.c: (button_press_callback): Grab
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 090973588..19dad26b3 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -386,9 +386,11 @@ handle_transfer_ok (const GnomeVFSXferProgressInfo *progress_info,
if (transfer_info->cancelled
&& progress_info->phase != GNOME_VFS_XFER_PHASE_COMPLETED) {
/* If cancelled, delete any partially copied files that are laying
- * around and return.
+ * around and return. Don't delete the source though..
*/
if (progress_info->target_name != NULL
+ && progress_info->source_name != NULL
+ && strcmp (progress_info->source_name, progress_info->target_name) != 0
&& progress_info->bytes_total != progress_info->bytes_copied) {
GList *delete_me;