diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-07-20 18:14:10 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-07-20 18:14:10 +0000 |
| commit | 062cde619b9eaf5a60033be3d8f31d1f0b4be470 (patch) | |
| tree | 0a0d8db0ba361996b3e18778c16cdc366d1f8d77 | |
| parent | 1d44acf3665223aca5d4cd80e4ce3b5bf54cf336 (diff) | |
| download | nautilus-062cde619b9eaf5a60033be3d8f31d1f0b4be470.tar.gz | |
Use NautilusFile icon for normal buttons, rather than forcing folder icon.
2008-07-20 Christian Neumair <cneumair@gnome.org>
* src/nautilus-pathbar.c (get_type_icon_info):
Use NautilusFile icon for normal buttons, rather than forcing folder
icon. Fixes special location icons like network:///, computer:/// etc.
svn path=/trunk/; revision=14378
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/nautilus-pathbar.c | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2008-07-20 Christian Neumair <cneumair@gnome.org> + * src/nautilus-pathbar.c (get_type_icon_info): + Use NautilusFile icon for normal buttons, rather than forcing folder + icon. Fixes special location icons like network:///, computer:/// etc. + +2008-07-20 Christian Neumair <cneumair@gnome.org> + * libnautilus-private/nautilus-file.c (update_info_internal): Only update referenced MIME type if it actually changed. diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c index 432d132e3..7992a31db 100644 --- a/src/nautilus-pathbar.c +++ b/src/nautilus-pathbar.c @@ -1174,8 +1174,9 @@ get_type_icon_info (ButtonData *button_data) case NORMAL_BUTTON: if (button_data->is_base_dir) { - return nautilus_icon_info_lookup_from_name (NAUTILUS_ICON_FOLDER, - NAUTILUS_PATH_BAR_ICON_SIZE); + return nautilus_file_get_icon (button_data->file, + NAUTILUS_PATH_BAR_ICON_SIZE, + NAUTILUS_FILE_ICON_FLAGS_NONE); } default: |