diff options
author | António Fernandes <antoniof@gnome.org> | 2020-04-10 22:42:55 +0100 |
---|---|---|
committer | António Fernandes <antoniof@gnome.org> | 2020-04-10 22:42:55 +0100 |
commit | 626c6210036fbb7f7f4706ce75cb4b56040c5c35 (patch) | |
tree | e8db73bfc83787d37829eea5bb19a2778dc4196c | |
parent | ce49f18a049ad1f7e808b9773d51a22ca2ba4510 (diff) | |
download | nautilus-626c6210036fbb7f7f4706ce75cb4b56040c5c35.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 a4a7e1b21..8a482d447 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -5331,31 +5331,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); } } |