summaryrefslogtreecommitdiff
path: root/src/file-manager/fm-directory-view.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/file-manager/fm-directory-view.c')
-rw-r--r--src/file-manager/fm-directory-view.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 55003cbf7..b068dc727 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -4651,11 +4651,15 @@ get_menu_icon (const char *icon_name)
int size;
size = nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_MENU);
-
- info = nautilus_icon_info_lookup_from_name (icon_name, size);
+
+ if (g_path_is_absolute (icon_name)) {
+ info = nautilus_icon_info_lookup_from_path (icon_name, size);
+ } else {
+ info = nautilus_icon_info_lookup_from_name (icon_name, size);
+ }
pixbuf = nautilus_icon_info_get_pixbuf_nodefault_at_size (info, size);
g_object_unref (info);
-
+
return pixbuf;
}
@@ -4698,8 +4702,6 @@ add_extension_action_for_files (FMDirectoryView *view,
tip,
icon);
- /* TODO: This should really use themed icons, but that
- doesn't work here yet */
if (icon != NULL) {
pixbuf = get_menu_icon (icon);
if (pixbuf != NULL) {