mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-08-25 02:36:07 +00:00
Revert "file: use emblems for files that use default icon"
This reverts commit 8efe356653
.
It aggravated a performance bug. Reverting only on stable branches.
https://gitlab.gnome.org/GNOME/nautilus/-/issues/1226
This commit is contained in:
parent
1de9f8ef3d
commit
ca6d56fef0
|
@ -5330,31 +5330,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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue