diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2018-07-25 09:10:02 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ekulik@redhat.com> | 2019-06-29 14:33:41 +0200 |
| commit | b36ac6f09327c30df2531eaca75e6b08ce3530df (patch) | |
| tree | 0c99558ef6fdcc54bcde322a1ae4c7b5ee906ef1 | |
| parent | 4093044ff6fbac6cdc186a837b558ff5a2a21a87 (diff) | |
| download | nautilus-b36ac6f09327c30df2531eaca75e6b08ce3530df.tar.gz | |
file: Remove references to folder-open icon
It’s no longer actually used.
| -rw-r--r-- | src/nautilus-file.c | 5 | ||||
| -rw-r--r-- | src/nautilus-file.h | 17 |
2 files changed, 8 insertions, 14 deletions
diff --git a/src/nautilus-file.c b/src/nautilus-file.c index 0597af507..131dcd604 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -5018,7 +5018,6 @@ nautilus_file_get_gicon (NautilusFile *file, icon = NULL; if (((flags & NAUTILUS_FILE_ICON_FLAGS_FOR_DRAG_ACCEPT) || - (flags & NAUTILUS_FILE_ICON_FLAGS_FOR_OPEN_FOLDER) || (flags & NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON) || (flags & NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS)) && G_IS_THEMED_ICON (file->details->icon)) @@ -5048,10 +5047,6 @@ nautilus_file_get_gicon (NautilusFile *file, { g_ptr_array_add (prepend_array, "folder"); } - if (is_folder && (flags & NAUTILUS_FILE_ICON_FLAGS_FOR_OPEN_FOLDER)) - { - g_ptr_array_add (prepend_array, "folder-open"); - } if (is_folder && (flags & NAUTILUS_FILE_ICON_FLAGS_FOR_DRAG_ACCEPT)) { diff --git a/src/nautilus-file.h b/src/nautilus-file.h index 82de25ddb..9b98cf5cc 100644 --- a/src/nautilus-file.h +++ b/src/nautilus-file.h @@ -77,18 +77,17 @@ typedef enum { } NautilusRequestStatus; typedef enum { - NAUTILUS_FILE_ICON_FLAGS_NONE = 0, - NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS = (1<<0), - NAUTILUS_FILE_ICON_FLAGS_IGNORE_VISITING = (1<<1), - NAUTILUS_FILE_ICON_FLAGS_FOR_DRAG_ACCEPT = (1<<2), - NAUTILUS_FILE_ICON_FLAGS_FOR_OPEN_FOLDER = (1<<3), + NAUTILUS_FILE_ICON_FLAGS_NONE = 0, + NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS = (1 << 0), + NAUTILUS_FILE_ICON_FLAGS_IGNORE_VISITING = (1 << 1), + NAUTILUS_FILE_ICON_FLAGS_FOR_DRAG_ACCEPT = (1 << 2), /* whether the thumbnail size must match the display icon size */ - NAUTILUS_FILE_ICON_FLAGS_FORCE_THUMBNAIL_SIZE = (1<<4), + NAUTILUS_FILE_ICON_FLAGS_FORCE_THUMBNAIL_SIZE = (1 << 3), /* uses the icon of the mount if present */ - NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON = (1<<5), + NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON = (1 << 4), /* render emblems */ - NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS = (1<<6), - NAUTILUS_FILE_ICON_FLAGS_USE_ONE_EMBLEM = (1<<7) + NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS = (1 << 5), + NAUTILUS_FILE_ICON_FLAGS_USE_ONE_EMBLEM = (1 << 6) } NautilusFileIconFlags; /* Item of the drag selection list */ |