1 files changed, 25 insertions, 10 deletions

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 9788a89f060e..9c558eefd4f2 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -1,11 +1,26 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Mon Aug 16 11:11:09 2004
-+++ libgnomevfs/gnome-vfs-utils.c	Mon Aug 16 11:11:16 2004
-@@ -871,7 +871,7 @@
- 	paths = g_strsplit (gnome_var, ":", 0); 
- 
+--- libgnomevfs/gnome-vfs-utils.c.orig	Thu Sep 15 07:02:53 2005
++++ libgnomevfs/gnome-vfs-utils.c	Sat Oct 22 02:12:32 2005
+@@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const
  	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
--		full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL);
-+		full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL);
- 		if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) {
- 			g_strfreev (paths);
- 			return full_filename;
+ 		full_filename = g_build_filename (*temp_paths,
+ 						  "share",
++						  "gnome",
+ 						  "pixmaps",
+ 						  relative_filename,
+ 						  NULL);
+@@ -1991,9 +1992,14 @@ _gnome_vfs_uri_resolve_all_symlinks_uri 
+ 			resolved_uri = gnome_vfs_uri_resolve_relative (new_uri,
+ 								       info->symlink_name);
+ 			if (*p != 0) {
++				gnome_vfs_uri_unref (new_uri);
++
++				new_uri = gnome_vfs_uri_append_string (resolved_uri, p);
++
+ 				gnome_vfs_uri_unref (uri);
+-				uri = gnome_vfs_uri_append_string (resolved_uri, p);
+ 				gnome_vfs_uri_unref (resolved_uri);
++
++				uri = gnome_vfs_uri_ref (new_uri);
+ 			} else {
+ 				gnome_vfs_uri_unref (uri);
+ 				uri = resolved_uri;