diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-09-27 11:13:43 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-09-27 11:13:43 +0000 |
| commit | f061314d6c90d82010447ea5cb9ec8fb2ab113ba (patch) | |
| tree | 467e505b23a8cfc99b24dce482b7c1d699dad1fa /libnautilus-private/nautilus-directory-async.c | |
| parent | a6f76dc331408a665af4b0b30b1544338f03423c (diff) | |
| download | nautilus-f061314d6c90d82010447ea5cb9ec8fb2ab113ba.tar.gz | |
Pass link info's URI to nautilus_link_get_link_info_given_file_contents().
2008-09-27 Christian Neumair <cneumair@gnome.org>
* libnautilus-private/nautilus-directory-async.c
(link_info_got_data):
Pass link info's URI to
nautilus_link_get_link_info_given_file_contents().
* libnautilus-private/nautilus-link.c
(nautilus_link_get_link_uri_from_desktop),
(nautilus_link_get_link_info_given_file_contents):
* libnautilus-private/nautilus-link.h:
Add an input parameter for the link info's URI to
nautilus_link_get_link_info_given_file_contents().
In nautilus_link_get_link_uri_from_desktop(), when
a desktop icon has an "URI=filename" entry resolve
it like a symbolic link name relative to the link
info parent. Ideally, we'd have
g_file_parse_name_relative() which could do that for us,
but it would mangle URI's fragments and queries anyway.
svn path=/trunk/; revision=14668
Diffstat (limited to 'libnautilus-private/nautilus-directory-async.c')
| -rw-r--r-- | libnautilus-private/nautilus-directory-async.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index 161152309..dea2ec3e5 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -3620,7 +3620,7 @@ link_info_got_data (NautilusDirectory *directory, goffset bytes_read, char *file_contents) { - char *uri, *name, *icon; + char *link_uri, *uri, *name, *icon; gboolean is_launcher; nautilus_directory_ref (directory); @@ -3632,8 +3632,10 @@ link_info_got_data (NautilusDirectory *directory, /* Handle the case where we read the Nautilus link. */ if (result) { - nautilus_link_get_link_info_given_file_contents (file_contents, bytes_read, + link_uri = nautilus_file_get_uri (file); + nautilus_link_get_link_info_given_file_contents (file_contents, bytes_read, link_uri, &uri, &name, &icon, &is_launcher); + g_free (link_uri); } else { /* FIXME bugzilla.gnome.org 42433: We should report this error to the user. */ } |