isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-30 13:49:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

iconcache: Remove want_fallback hint

Browse Source 
It's unused, and if it was ever set, it would cause an assert fail.
This commit is contained in:
Jasper St. Pierre 2014-07-14 11:23:18 -04:00
parent 55354f5c38
commit a57c3ae105
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/x11/iconcache.c
View File

@ -550,7 +550,6 @@ meta_icon_cache_init (MetaIconCache *icon_cache)
icon_cache->ideal_mini_width = -1; icon_cache->ideal_mini_width = -1;
icon_cache->ideal_mini_height = -1; icon_cache->ideal_mini_height = -1;
#endif #endif
icon_cache->want_fallback = TRUE;
icon_cache->wm_hints_dirty = TRUE; icon_cache->wm_hints_dirty = TRUE;
icon_cache->kwm_win_icon_dirty = TRUE; icon_cache->kwm_win_icon_dirty = TRUE;
icon_cache->net_wm_icon_dirty = TRUE; icon_cache->net_wm_icon_dirty = TRUE;
@ -611,13 +610,7 @@ meta_icon_cache_get_icon_invalidated (MetaIconCache *icon_cache)
else if (icon_cache->origin <= USING_NET_WM_ICON && else if (icon_cache->origin <= USING_NET_WM_ICON &&
icon_cache->net_wm_icon_dirty) icon_cache->net_wm_icon_dirty)
return TRUE; return TRUE;
else if (icon_cache->origin < USING_FALLBACK_ICON && else if (icon_cache->origin < USING_FALLBACK_ICON)
icon_cache->want_fallback)
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; return TRUE;
else else
return FALSE; return FALSE;
@ -849,8 +842,7 @@ meta_read_icons (MetaScreen *screen,
} }
} }
if (icon_cache->want_fallback && if (icon_cache->origin < USING_FALLBACK_ICON)
icon_cache->origin < USING_FALLBACK_ICON)
{ {
get_fallback_icons (screen, get_fallback_icons (screen,
iconp, iconp,
@ -866,15 +858,6 @@ meta_read_icons (MetaScreen *screen,
return TRUE; 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 */ /* found nothing new */
return FALSE; return FALSE;
} }

1
src/x11/iconcache.h
View File

@ -44,7 +44,6 @@ struct _MetaIconCache
int origin; int origin;
Pixmap prev_pixmap; Pixmap prev_pixmap;
Pixmap prev_mask; Pixmap prev_mask;
guint want_fallback : 1;
/* TRUE if these props have changed */ /* TRUE if these props have changed */
guint wm_hints_dirty : 1; guint wm_hints_dirty : 1;
guint kwm_win_icon_dirty : 1; guint kwm_win_icon_dirty : 1;