gnome-vfs r5432 - in trunk: . libgnomevfs

[alexl svn gnome org]

Author: alexl
Date: Wed Jan 16 11:50:59 2008
New Revision: 5432
URL: http://svn.gnome.org/viewvc/gnome-vfs?rev=5432&view=rev

Log:
2008-01-16  Alexander Larsson  <alexl redhat com>

        * libgnomevfs/gnome-vfs-cancellable-ops.c:
        (gnome_vfs_find_directory_cancellable):
	Revert previous patch (see #312506)




Modified:
   trunk/ChangeLog
   trunk/libgnomevfs/gnome-vfs-cancellable-ops.c

Modified: trunk/libgnomevfs/gnome-vfs-cancellable-ops.c
==============================================================================
--- trunk/libgnomevfs/gnome-vfs-cancellable-ops.c	(original)
+++ trunk/libgnomevfs/gnome-vfs-cancellable-ops.c	Wed Jan 16 11:50:59 2008
@@ -285,7 +285,7 @@
 				      GnomeVFSContext *context)
 {
 	GnomeVFSResult result;
-	GnomeVFSURI *resolved_uri, *parent_uri;
+	GnomeVFSURI *resolved_uri;
 
 	g_return_val_if_fail (result_uri != NULL, GNOME_VFS_ERROR_BAD_PARAMETERS);
 
@@ -323,13 +323,7 @@
 	 * we want to look at the device the symlink points to, not the one the
 	 * symlink is stored on
 	 */
-	parent_uri = gnome_vfs_uri_get_parent (near_uri);
-	if (parent_uri) {
-		gnome_vfs_uri_unref (near_uri);
-		near_uri = parent_uri;
-	}
 	result = _gnome_vfs_uri_resolve_all_symlinks_uri (near_uri, &resolved_uri);
-
 	if (result == GNOME_VFS_OK) {
 		gnome_vfs_uri_unref (near_uri);
 		near_uri = resolved_uri;