[metacity/simplify-iconcache: 4/5] iconcache: remove want_fallback

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 044b3262d6e431f590908dcb2fb802aadcfb2da6
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Mar 19 17:02:08 2020 +0200

    iconcache: remove want_fallback
    
    It is always TRUE.

 src/core/iconcache.c | 19 ++-----------------
 src/core/iconcache.h |  1 -
 2 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/src/core/iconcache.c b/src/core/iconcache.c
index 0b68e668..464844c8 100644
--- a/src/core/iconcache.c
+++ b/src/core/iconcache.c
@@ -495,7 +495,6 @@ meta_icon_cache_init (MetaIconCache *icon_cache)
   icon_cache->origin = USING_NO_ICON;
   icon_cache->prev_pixmap = None;
   icon_cache->prev_mask = None;
-  icon_cache->want_fallback = TRUE;
   icon_cache->wm_hints_dirty = TRUE;
   icon_cache->kwm_win_icon_dirty = TRUE;
   icon_cache->net_wm_icon_dirty = TRUE;
@@ -546,14 +545,10 @@ meta_icon_cache_get_icon_invalidated (MetaIconCache *icon_cache)
   else if (icon_cache->origin <= USING_NET_WM_ICON &&
            icon_cache->net_wm_icon_dirty)
     return TRUE;
-  else if (icon_cache->origin < USING_FALLBACK_ICON &&
-           icon_cache->want_fallback)
+  else if (icon_cache->origin < USING_FALLBACK_ICON)
     return TRUE;
   else if (icon_cache->origin == USING_NO_ICON)
     return TRUE;
-  else if (icon_cache->origin == USING_FALLBACK_ICON &&
-           !icon_cache->want_fallback)
-    return TRUE;
   else
     return FALSE;
 }
@@ -775,8 +770,7 @@ meta_read_icons (MetaScreen     *screen,
         }
     }
 
-  if (icon_cache->want_fallback &&
-      icon_cache->origin < USING_FALLBACK_ICON)
+  if (icon_cache->origin < USING_FALLBACK_ICON)
     {
       get_fallback_icons (screen,
                           iconp,
@@ -790,15 +784,6 @@ meta_read_icons (MetaScreen     *screen,
       return TRUE;
     }
 
-  if (!icon_cache->want_fallback &&
-      icon_cache->origin == USING_FALLBACK_ICON)
-    {
-      /* Get rid of current icon */
-      clear_icon_cache (icon_cache, FALSE);
-
-      return TRUE;
-    }
-
   /* found nothing new */
   return FALSE;
 }
diff --git a/src/core/iconcache.h b/src/core/iconcache.h
index a243055c..cdc18003 100644
--- a/src/core/iconcache.h
+++ b/src/core/iconcache.h
@@ -44,7 +44,6 @@ struct _MetaIconCache
   int origin;
   Pixmap prev_pixmap;
   Pixmap prev_mask;
-  guint want_fallback : 1;
   /* TRUE if these props have changed */
   guint wm_hints_dirty : 1;
   guint kwm_win_icon_dirty : 1;