gnome-vfs freeze break request - make link



This commit:

2004-08-14  Ryan Lortie  <desrt desrt ca>

	* libgnomevfs/gnome-vfs-xfer.c: fix small leaks


Was a bit eager in removing unused code, so it broke the handling of
unique names when making symlinks and moving items (it doesn't loop on
EEXISTS). This means the "Make Symlink" operation in Nautilus just
doesn't work.

This patch restores the functionallity:
Index: libgnomevfs/gnome-vfs-xfer.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-xfer.c,v
retrieving revision 1.114
diff -u -p -r1.114 gnome-vfs-xfer.c
--- libgnomevfs/gnome-vfs-xfer.c	14 Aug 2004 10:35:06 -0000	1.114
+++ libgnomevfs/gnome-vfs-xfer.c	6 Sep 2004 15:55:56 -0000
@@ -1865,6 +1865,7 @@ move_items (const GList *source_uri_list
 					break;
 
 				conflict_count++;
+				retry = TRUE;
 				continue;
 			}
 
@@ -1967,6 +1968,7 @@ link_items (const GList *source_uri_list
 					break;
 
 				conflict_count++;
+				retry = TRUE;
 				continue;
 			}
 			

Is it ok to commit?


=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 Alexander Larsson                                            Red Hat, Inc 
                   alexl redhat com    alla lysator liu se 
He's a sword-wielding pirate dog-catcher plagued by the memory of his family's 
brutal murder. She's an elegant antique-collecting Valkyrie from out of town. 
They fight crime! 




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