diff options
author | Mike Engber <engber@src.gnome.org> | 2001-02-22 01:56:04 +0000 |
---|---|---|
committer | Mike Engber <engber@src.gnome.org> | 2001-02-22 01:56:04 +0000 |
commit | 78694813789e79f3176cf8a59cdf690bcae1e4ae (patch) | |
tree | 9860a75498c4c830b026e0c9721af5670f688827 | |
parent | f81a0d0e2949cd680289823b7639d288e09e27e3 (diff) | |
download | nautilus-78694813789e79f3176cf8a59cdf690bcae1e4ae.tar.gz |
reviewed by: Darin Adler <darin@eazel.com>
reviewed by: Darin Adler <darin@eazel.com>
* src/file-manager/fm-properties-window.c: (set_icon_callback):
Property window now stores a uri (as opposed to a path) in
metadata for custom icons - bug 6841.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | src/file-manager/fm-properties-window.c | 5 |
2 files changed, 12 insertions, 1 deletions
@@ -1,6 +1,14 @@ 2001-02-21 Michael Engber <engber@eazel.com> reviewed by: Darin Adler <darin@eazel.com> + + * src/file-manager/fm-properties-window.c: (set_icon_callback): + Property window now stores a uri (as opposed to a path) in + metadata for custom icons - bug 6841. + +2001-02-21 Michael Engber <engber@eazel.com> + + reviewed by: Darin Adler <darin@eazel.com> John Sullivan <sullivan@eazel.com> * libnautilus-extensions/Makefile.am: diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index b217949fe..5723527a6 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -2375,13 +2375,16 @@ static void set_icon_callback (const char* icon_path, FMPropertiesWindow *properties_window) { NautilusFile *file; + char *icon_uri; g_return_if_fail (properties_window != NULL); g_return_if_fail (FM_IS_PROPERTIES_WINDOW (properties_window)); if (icon_path != NULL) { file = properties_window->details->original_file; - nautilus_file_set_metadata (file, NAUTILUS_METADATA_KEY_CUSTOM_ICON, NULL, icon_path); + icon_uri = gnome_vfs_get_uri_from_local_path (icon_path); + nautilus_file_set_metadata (file, NAUTILUS_METADATA_KEY_CUSTOM_ICON, NULL, icon_uri); + g_free (icon_uri); nautilus_file_set_metadata (file, NAUTILUS_METADATA_KEY_ICON_SCALE, NULL, NULL); /* re-enable the property window's clear image button */ |