[nautilus/wip/ernestask/gtk4-continued: 4/50] file: Remove references to folder-open icon



commit ae08713c68963ef80701de57199288bc83bbc19f
Author: Ernestas Kulik <ernestask gnome org>
Date:   Wed Jul 25 09:10:02 2018 +0300

    file: Remove references to folder-open icon
    
    It’s no longer actually used.

 src/nautilus-file.c |  5 -----
 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 8b81b810e..6a67752b2 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -5028,7 +5028,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))
@@ -5058,10 +5057,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 */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]