nautilus r13578 - in trunk: . libnautilus-private

[awalton svn gnome org]

Author: awalton
Date: Wed Jan  9 12:05:39 2008
New Revision: 13578
URL: http://svn.gnome.org/viewvc/nautilus?rev=13578&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-file-operations.c

Modified: trunk/libnautilus-private/nautilus-file-operations.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file-operations.c	(original)
+++ trunk/libnautilus-private/nautilus-file-operations.c	Wed Jan  9 12:05:39 2008
@@ -3665,7 +3665,6 @@
 		    (!is_merge && job->replace_all)) {
 			g_free (primary);
 			g_free (secondary);
-			g_error_free (error);
 			
 			overwrite = TRUE;
 			goto retry;
@@ -3674,7 +3673,6 @@
 		if (job->skip_all_conflict) {
 			g_free (primary);
 			g_free (secondary);
-			g_error_free (error);
 			
 			goto out;
 		}
@@ -3690,8 +3688,6 @@
 					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 */