[gtk/wip/baedert/for-master: 106/146] gtkicontheme: Avoid a get_icon_flags call

[Timm Bäder <baedert src gnome org>]

commit 7eb137a2a367b83e77257f84011acbd0ac77fd98
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 1cb73635e0..7aac0b8b3e 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -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;