diff options
author | António Fernandes <antoniof@gnome.org> | 2020-04-10 22:38:21 +0100 |
---|---|---|
committer | António Fernandes <antoniof@gnome.org> | 2020-04-10 22:38:21 +0100 |
commit | 2ff6b784d5978fa3bf1c78f435048e5bb43c645c (patch) | |
tree | 5907a9da899ddf3bc668b6efb0f8e13fa5804cd5 | |
parent | c3ca2be836163854860d2d0ed4e41c49987c9207 (diff) | |
download | nautilus-2ff6b784d5978fa3bf1c78f435048e5bb43c645c.tar.gz |
Revert "file: use emblems for files that use default icon"
This reverts commit 8efe35665368539de0e15f150292996cb0ab9121.
It aggravated a performance bug. Reverting only on stable branches.
https://gitlab.gnome.org/GNOME/nautilus/-/issues/1226
-rw-r--r-- | src/nautilus-file.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/nautilus-file.c b/src/nautilus-file.c index 45603af08..8d1fbb54c 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -5327,31 +5327,10 @@ nautilus_file_get_icon (NautilusFile *file, icon = nautilus_icon_info_lookup (gicon, size, scale); g_object_unref (gicon); - /* Files for which the MIME type cannot be determined will result in - * the icon being detected as a fallback. This is because the default - * theme does not have icons for the names corresponding to these file - * types. */ if (nautilus_icon_info_is_fallback (icon)) { g_object_unref (icon); - - gicon = get_default_file_icon (); - - /* Increase ref count on gicon, even though it is statically - * allocated. This is needed because apply_emblems_to_icon - * decreases the ref count on the original icon it is given. */ - g_object_ref (gicon); - - if (flags & NAUTILUS_FILE_ICON_FLAGS_USE_EMBLEMS) - { - apply_emblems_to_icon (file, &gicon, flags); - } - - icon = nautilus_icon_info_lookup (gicon, size, scale); - - /* Decrease ref count on either the static default icon, or on the - * newly-created emblemed icon. */ - g_object_unref (gicon); + icon = nautilus_icon_info_lookup (get_default_file_icon (), size, scale); } } |