Attempt to fix Trash handling on -CURRENT where /home -> usr/home. I would

really appreciate feedback on this, especially from users that do not have
/home -> usr/home that had Trash working prior to this commit.  Basically, if
you start to experience any problems moving files or directories in
Nautilus after applying this patch, let me know.

See http://bugzilla.gnome.org/show_bug.cgi?id=312536 for more details.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4381 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 68 insertions, 6 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 9033b8335..d89ee63b6 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.100 2005/07/11 21:20:18 marcus Exp $
+#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.101 2005/07/26 02:35:06 marcus Exp $
 #
 
 PORTNAME=	gnomevfs2
 PORTVERSION=	2.11.90
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.11
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
index a3ef273b0..54a68216d 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -1,5 +1,5 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Sun May 22 23:18:12 2005
-+++ libgnomevfs/gnome-vfs-utils.c	Sun May 22 23:18:55 2005
+--- libgnomevfs/gnome-vfs-utils.c.orig	Sun May  8 09:04:05 2005
++++ libgnomevfs/gnome-vfs-utils.c	Thu Aug  4 01:58:06 2005
 @@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const
  	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
  		full_filename = g_build_filename (*temp_paths,
@@ -8,3 +8,33 @@
  						  "pixmaps",
  						  relative_filename,
  						  NULL);
+@@ -1954,6 +1955,7 @@ _gnome_vfs_uri_resolve_all_symlinks_uri 
+ 	GnomeVFSResult res;
+ 	char *p;
+ 	int n_followed_symlinks;
++	int fully_qualified = 0;
+ 
+ 	/* Ref the original uri so we don't lose it */
+ 	uri = gnome_vfs_uri_ref (uri);
+@@ -1963,6 +1965,8 @@ _gnome_vfs_uri_resolve_all_symlinks_uri 
+ 	info = gnome_vfs_file_info_new ();
+ 
+ 	p = uri->text;
++	if (*p == GNOME_VFS_URI_PATH_CHR)
++		fully_qualified++;
+ 	n_followed_symlinks = 0;
+ 	while (*p != 0) {
+ 		while (*p == GNOME_VFS_URI_PATH_CHR)
+@@ -1972,7 +1976,11 @@ _gnome_vfs_uri_resolve_all_symlinks_uri 
+ 
+ 		new_uri = gnome_vfs_uri_dup (uri);
+ 		g_free (new_uri->text);
+-		new_uri->text = g_strndup (uri->text, p - uri->text);
++		if (fully_qualified-- > 0)
++			new_uri->text = g_strdup_printf ("%c",
++					GNOME_VFS_URI_PATH_CHR);
++		else
++			new_uri->text = g_strndup (uri->text, p - uri->text);
+ 		
+ 		gnome_vfs_file_info_clear (info);
+ 		res = gnome_vfs_get_file_info_uri (new_uri, info, GNOME_VFS_FILE_INFO_DEFAULT);
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 9033b8335..d89ee63b6 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.100 2005/07/11 21:20:18 marcus Exp $
+#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.101 2005/07/26 02:35:06 marcus Exp $
 #
 
 PORTNAME=	gnomevfs2
 PORTVERSION=	2.11.90
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.11
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
index a3ef273b0..54a68216d 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -1,5 +1,5 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Sun May 22 23:18:12 2005
-+++ libgnomevfs/gnome-vfs-utils.c	Sun May 22 23:18:55 2005
+--- libgnomevfs/gnome-vfs-utils.c.orig	Sun May  8 09:04:05 2005
++++ libgnomevfs/gnome-vfs-utils.c	Thu Aug  4 01:58:06 2005
 @@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const
  	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
  		full_filename = g_build_filename (*temp_paths,
@@ -8,3 +8,33 @@
  						  "pixmaps",
  						  relative_filename,
  						  NULL);
+@@ -1954,6 +1955,7 @@ _gnome_vfs_uri_resolve_all_symlinks_uri 
+ 	GnomeVFSResult res;
+ 	char *p;
+ 	int n_followed_symlinks;
++	int fully_qualified = 0;
+ 
+ 	/* Ref the original uri so we don't lose it */
+ 	uri = gnome_vfs_uri_ref (uri);
+@@ -1963,6 +1965,8 @@ _gnome_vfs_uri_resolve_all_symlinks_uri 
+ 	info = gnome_vfs_file_info_new ();
+ 
+ 	p = uri->text;
++	if (*p == GNOME_VFS_URI_PATH_CHR)
++		fully_qualified++;
+ 	n_followed_symlinks = 0;
+ 	while (*p != 0) {
+ 		while (*p == GNOME_VFS_URI_PATH_CHR)
+@@ -1972,7 +1976,11 @@ _gnome_vfs_uri_resolve_all_symlinks_uri 
+ 
+ 		new_uri = gnome_vfs_uri_dup (uri);
+ 		g_free (new_uri->text);
+-		new_uri->text = g_strndup (uri->text, p - uri->text);
++		if (fully_qualified-- > 0)
++			new_uri->text = g_strdup_printf ("%c",
++					GNOME_VFS_URI_PATH_CHR);
++		else
++			new_uri->text = g_strndup (uri->text, p - uri->text);
+ 		
+ 		gnome_vfs_file_info_clear (info);
+ 		res = gnome_vfs_get_file_info_uri (new_uri, info, GNOME_VFS_FILE_INFO_DEFAULT);