[mutter] iconcache: Remove dead code
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] iconcache: Remove dead code
- Date: Mon, 14 Jul 2014 16:15:54 +0000 (UTC)
commit 92388892b3d93e59f0537a56dde110b16b304674
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Jul 14 11:27:01 2014 -0400
iconcache: Remove dead code
src/x11/iconcache.c | 46 +++++-----------------------------------------
1 files changed, 5 insertions(+), 41 deletions(-)
---
diff --git a/src/x11/iconcache.c b/src/x11/iconcache.c
index d6dfb38..7511279 100644
--- a/src/x11/iconcache.c
+++ b/src/x11/iconcache.c
@@ -547,24 +547,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
@@ -598,17 +584,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,
@@ -726,9 +701,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;
}
else
@@ -764,10 +737,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;
}
}
@@ -790,10 +760,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;
}
}
@@ -808,10 +775,7 @@ meta_read_icons (MetaScreen *screen,
mini_iconp,
ideal_mini_width,
ideal_mini_height);
-
- replace_cache (icon_cache, USING_FALLBACK_ICON,
- *iconp, *mini_iconp);
-
+ icon_cache->origin = USING_FALLBACK_ICON;
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]