[gtk/wip/baedert/icontheme: 2/7] gtkicontheme: Avoid a get_icon_flags call
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/icontheme: 2/7] gtkicontheme: Avoid a get_icon_flags call
- Date: Tue, 21 May 2019 14:25:53 +0000 (UTC)
commit 63cf2ba25114bb4222006260b37373bb85deaaa0
Author: Timm Bäder <mail baedert org>
Date: Tue May 21 11:07:23 2019 +0200
gtkicontheme: Avoid a get_icon_flags call
We're only using the value of the first call at all if
symbolic_suffix & ICON_SUFFIX_PNG is FALSE.
gtk/gtkicontheme.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 644be6d924..809e58d81d 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -2778,10 +2778,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 */
@@ -2793,7 +2789,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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]