AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtkicontheme: Avoid a get_icon_flags call

Browse Source 
We're only using the value of the first call at all if
symbolic_suffix & ICON_SUFFIX_PNG is FALSE.
This commit is contained in:
Timm Bäder 2019-05-21 11:07:23 +02:00
parent c5ed51a188
commit 6d77723fe0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkicontheme.c
View File

@ -2798,10 +2798,6 @@ theme_dir_get_icon_suffix (IconThemeDir *dir,
if (dir->cache)
{
suffix = (IconSuffix)gtk_icon_cache_get_icon_flags (dir->cache,
icon_name,
dir->subdir_index);
if (icon_name_is_symbolic (icon_name))
{
/* Look for foo-symbolic.symbolic.png, as the cache only stores the ".png" suffix */
@ -2813,7 +2809,15 @@ theme_dir_get_icon_suffix (IconThemeDir *dir,
if (symbolic_suffix & ICON_SUFFIX_PNG)
suffix = ICON_SUFFIX_SYMBOLIC_PNG;
else
suffix = (IconSuffix)gtk_icon_cache_get_icon_flags (dir->cache,
icon_name,
dir->subdir_index);
}
else
suffix = (IconSuffix)gtk_icon_cache_get_icon_flags (dir->cache,
icon_name,
dir->subdir_index);
if (has_icon_file)
*has_icon_file = suffix & HAS_ICON_FILE;