isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-15 04:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

iconcache: Remove dead code

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-07-14 11:27:01 -04:00
parent 5d124ac00a
commit 92388892b3
1 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/x11/iconcache.c
View File

@ -547,24 +547,10 @@ meta_icon_cache_init (MetaIconCache *icon_cache)
icon_cache->net_wm_icon_dirty = TRUE; 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 void
meta_icon_cache_free (MetaIconCache *icon_cache) meta_icon_cache_free (MetaIconCache *icon_cache)
{ {
clear_icon_cache (icon_cache, FALSE); icon_cache->origin = USING_NO_ICON;
} }
void void
@ -598,17 +584,6 @@ meta_icon_cache_get_icon_invalidated (MetaIconCache *icon_cache)
return FALSE; 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* static GdkPixbuf*
scaled_from_pixdata (guchar *pixdata, scaled_from_pixdata (guchar *pixdata,
int w, int w,
@ -726,9 +701,7 @@ meta_read_icons (MetaScreen *screen,
if (*iconp && *mini_iconp) if (*iconp && *mini_iconp)
{ {
replace_cache (icon_cache, USING_NET_WM_ICON, icon_cache->origin = USING_NET_WM_ICON;
*iconp, *mini_iconp);
return TRUE; return TRUE;
} }
else else
@ -764,10 +737,7 @@ meta_read_icons (MetaScreen *screen,
{ {
icon_cache->prev_pixmap = pixmap; icon_cache->prev_pixmap = pixmap;
icon_cache->prev_mask = mask; icon_cache->prev_mask = mask;
icon_cache->origin = USING_WM_HINTS;
replace_cache (icon_cache, USING_WM_HINTS,
*iconp, *mini_iconp);
return TRUE; return TRUE;
} }
} }
@ -790,10 +760,7 @@ meta_read_icons (MetaScreen *screen,
{ {
icon_cache->prev_pixmap = pixmap; icon_cache->prev_pixmap = pixmap;
icon_cache->prev_mask = mask; icon_cache->prev_mask = mask;
icon_cache->origin = USING_KWM_WIN_ICON;
replace_cache (icon_cache, USING_KWM_WIN_ICON,
*iconp, *mini_iconp);
return TRUE; return TRUE;
} }
} }
@ -808,10 +775,7 @@ meta_read_icons (MetaScreen *screen,
mini_iconp, mini_iconp,
ideal_mini_width, ideal_mini_width,
ideal_mini_height); ideal_mini_height);
icon_cache->origin = USING_FALLBACK_ICON;
replace_cache (icon_cache, USING_FALLBACK_ICON,
*iconp, *mini_iconp);
return TRUE; return TRUE;
} }