Commit 1be9ac6c authored by A. Walton's avatar A. Walton Committed by Andrew Walton

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
parent f1c2467e
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.
2008-01-09 Alexander Larsson <alexl@redhat.com>
* src/Makefile.am:
......
......@@ -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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment