diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-12-06 19:45:56 +0100 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2010-12-06 19:45:56 +0100 |
| commit | cb70787275e2e44cc2f3b394d1065313998fd1a3 (patch) | |
| tree | 99d69421a987a333e8efc7a08b1e2f6d75fe115f /libnautilus-private | |
| parent | c739fd781c355e47e4ef3f59e9e4008c230e83ad (diff) | |
| download | nautilus-cb70787275e2e44cc2f3b394d1065313998fd1a3.tar.gz | |
file-operations: remove duplicate code
Probably a leftover from NautilusFileConflictDialog branch.
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | 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 a000b6784..bb06540a2 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; |