[metacity/simplify-iconcache: 5/5] iconcache: remove dead code

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

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

    iconcache: remove dead code
    
    Based on mutter commit:
    https://gitlab.gnome.org/GNOME/mutter/-/commit/92388892b3d93e59f053

 src/core/iconcache.c | 39 +++++----------------------------------
 1 file changed, 5 insertions(+), 34 deletions(-)
---
diff --git a/src/core/iconcache.c b/src/core/iconcache.c
index 464844c8..47c12440 100644
--- a/src/core/iconcache.c
+++ b/src/core/iconcache.c
@@ -500,24 +500,10 @@ meta_icon_cache_init (MetaIconCache *icon_cache)
   icon_cache->net_wm_icon_dirty = TRUE;
 }
 
-static void
-clear_icon_cache (MetaIconCache *icon_cache,
-                  gboolean       dirty_all)
-{
-  icon_cache->origin = USING_NO_ICON;
-
-  if (dirty_all)
-    {
-      icon_cache->wm_hints_dirty = TRUE;
-      icon_cache->kwm_win_icon_dirty = TRUE;
-      icon_cache->net_wm_icon_dirty = TRUE;
-    }
-}
-
 void
 meta_icon_cache_free (MetaIconCache *icon_cache)
 {
-  clear_icon_cache (icon_cache, FALSE);
+  icon_cache->origin = USING_NO_ICON;
 }
 
 void
@@ -553,17 +539,6 @@ meta_icon_cache_get_icon_invalidated (MetaIconCache *icon_cache)
     return FALSE;
 }
 
-static void
-replace_cache (MetaIconCache *icon_cache,
-               IconOrigin     origin,
-               GdkPixbuf     *new_icon,
-               GdkPixbuf     *new_mini_icon)
-{
-  clear_icon_cache (icon_cache, FALSE);
-
-  icon_cache->origin = origin;
-}
-
 static GdkPixbuf*
 scaled_from_pixdata (guchar *pixdata,
                      int     w,
@@ -690,8 +665,7 @@ meta_read_icons (MetaScreen     *screen,
 
           if (*iconp && *mini_iconp)
             {
-              replace_cache (icon_cache, USING_NET_WM_ICON,
-                             *iconp, *mini_iconp);
+              icon_cache->origin = USING_NET_WM_ICON;
 
               return TRUE;
             }
@@ -732,8 +706,7 @@ meta_read_icons (MetaScreen     *screen,
               icon_cache->prev_pixmap = pixmap;
               icon_cache->prev_mask = mask;
 
-              replace_cache (icon_cache, USING_WM_HINTS,
-                             *iconp, *mini_iconp);
+              icon_cache->origin = USING_WM_HINTS;
 
               return TRUE;
             }
@@ -762,8 +735,7 @@ meta_read_icons (MetaScreen     *screen,
               icon_cache->prev_pixmap = pixmap;
               icon_cache->prev_mask = mask;
 
-              replace_cache (icon_cache, USING_KWM_WIN_ICON,
-                             *iconp, *mini_iconp);
+              icon_cache->origin = USING_KWM_WIN_ICON;
 
               return TRUE;
             }
@@ -778,8 +750,7 @@ meta_read_icons (MetaScreen     *screen,
                           mini_iconp,
                           ideal_mini_size);
 
-      replace_cache (icon_cache, USING_FALLBACK_ICON,
-                     *iconp, *mini_iconp);
+      icon_cache->origin = USING_FALLBACK_ICON;
 
       return TRUE;
     }