devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26

--- 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_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;