diff options
| author | Darin Adler <darin@src.gnome.org> | 2002-02-28 19:22:38 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2002-02-28 19:22:38 +0000 |
| commit | 5886f0e3ba00440b053f426e0bf9a617a90139b4 (patch) | |
| tree | 196ac63323e5ee904f8df2d1cd3d0de556bac85f /libnautilus-private/nautilus-link-desktop-file.c | |
| parent | 8b74353f7bd0c2b38d2bb64309574117bccdf37b (diff) | |
| download | nautilus-5886f0e3ba00440b053f426e0bf9a617a90139b4.tar.gz | |
Fix assert where it was calling gnome_vfs_get_uri_from_local_path on
* libnautilus-private/nautilus-link-desktop-file.c:
(nautilus_link_desktop_file_get_link_icon_from_desktop):
Fix assert where it was calling gnome_vfs_get_uri_from_local_path
on something that wasn't an absolute local path.
Diffstat (limited to 'libnautilus-private/nautilus-link-desktop-file.c')
| -rw-r--r-- | libnautilus-private/nautilus-link-desktop-file.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libnautilus-private/nautilus-link-desktop-file.c b/libnautilus-private/nautilus-link-desktop-file.c index 0f4740912..14944de53 100644 --- a/libnautilus-private/nautilus-link-desktop-file.c +++ b/libnautilus-private/nautilus-link-desktop-file.c @@ -323,14 +323,13 @@ nautilus_link_desktop_file_get_link_icon_from_desktop (GnomeDesktopItem *desktop } absolute = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, icon_name, TRUE, NULL); - if (absolute != NULL) { - g_free (icon_name); - icon_name = absolute; + g_free (icon_name); + if (absolute == NULL) { + return NULL; } - icon_uri = gnome_vfs_get_uri_from_local_path (icon_name); - g_free (icon_name); - + icon_uri = gnome_vfs_get_uri_from_local_path (absolute); + g_free (absolute); return icon_uri; } |