diff options
| author | A. Walton <awalton@svn.gnome.org> | 2008-01-09 12:05:39 +0000 |
|---|---|---|
| committer | Andrew Walton <awalton@src.gnome.org> | 2008-01-09 12:05:39 +0000 |
| commit | 1be9ac6cd749d8a2b9ba53164e7d4e13bff65fea (patch) | |
| tree | 2be4a0340e4379968e21d76726479c8d39993f1a /libnautilus-private | |
| parent | f1c2467e8f51d2d3db7a00b0a05dd5d2c63511d7 (diff) | |
| download | nautilus-1be9ac6cd749d8a2b9ba53164e7d4e13bff65fea.tar.gz | |
Remove bad g_error_free()'s causing crashes while merging files.
2008-01-09 A. Walton <awalton@svn.gnome.org>
* libnautilus-private/nautilus-file-operations.c:
(move_file_prepare):
Remove bad g_error_free()'s causing crashes while
merging files.
svn path=/trunk/; revision=13578
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 93a8bb69b..1c5536678 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -3665,7 +3665,6 @@ move_file_prepare (CopyMoveJob *move_job, (!is_merge && job->replace_all)) { g_free (primary); g_free (secondary); - g_error_free (error); overwrite = TRUE; goto retry; @@ -3674,7 +3673,6 @@ move_file_prepare (CopyMoveJob *move_job, if (job->skip_all_conflict) { g_free (primary); g_free (secondary); - g_error_free (error); goto out; } @@ -3690,8 +3688,6 @@ move_file_prepare (CopyMoveJob *move_job, is_merge?MERGE:REPLACE, NULL); - g_error_free (error); - if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { abort_job (job); } else if (response == 1 || response == 3) { /* skip all / skip */ |