[nautilus] file-operations: remove duplicate code



commit cb70787275e2e44cc2f3b394d1065313998fd1a3
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Dec 6 19:45:56 2010 +0100

    file-operations: remove duplicate code
    
    Probably a leftover from NautilusFileConflictDialog branch.

 libnautilus-private/nautilus-file-operations.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index a000b67..bb06540 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -4814,12 +4814,6 @@ move_file_prepare (CopyMoveJob *move_job,
 			g_object_unref (dest);
 			dest = get_target_file_for_display_name (dest_dir,
 								 response->new_name);
-			conflict_response_data_free (response);
-			goto retry;
-		} else if (response->id == CONFLICT_RESPONSE_RENAME) {
-			g_object_unref (dest);
-			dest = get_target_file_for_display_name (dest_dir,
-								 response->new_name);
 			renamed = TRUE;
 			conflict_response_data_free (response);
 			goto retry;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]