[Fwd: gnome-vfs freeze break request - make link]

[Alexander Larsson <alexl redhat com>]

Forgot to cc the release-team on this.
I already got murrays approval on gnome-vfs-list.

-------- Forwarded Message --------
From: Alexander Larsson <alexl redhat com>
To: gnome-vfs-list gnome org <gnome-vfs-list gnome org>
Subject: gnome-vfs freeze break request - make link
Date: Mon, 06 Sep 2004 17:59:55 +0200
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! 

_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list gnome org
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 Alexander Larsson                                            Red Hat, Inc 
                   alexl redhat com    alla lysator liu se 
He's a short-sighted one-eyed card sharp with a mysterious suitcase handcuffed 
to his arm. She's a virginal gold-digging bounty hunter from beyond the grave. 
They fight crime!