[mutter] iconcache: Remove want_fallback hint
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] iconcache: Remove want_fallback hint
- Date: Mon, 14 Jul 2014 16:15:44 +0000 (UTC)
commit a57c3ae105a2ddef6c67ec56f3852783a024c924
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Jul 14 11:23:18 2014 -0400
iconcache: Remove want_fallback hint
It's unused, and if it was ever set, it would cause an assert fail.
src/x11/iconcache.c | 21 ++-------------------
src/x11/iconcache.h | 1 -
2 files changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/src/x11/iconcache.c b/src/x11/iconcache.c
index 2bc5f43..9d6b009 100644
--- a/src/x11/iconcache.c
+++ b/src/x11/iconcache.c
@@ -550,7 +550,6 @@ meta_icon_cache_init (MetaIconCache *icon_cache)
icon_cache->ideal_mini_width = -1;
icon_cache->ideal_mini_height = -1;
#endif
- 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;
@@ -611,13 +610,7 @@ 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)
- return TRUE;
- else if (icon_cache->origin == USING_NO_ICON)
- 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
return FALSE;
@@ -849,8 +842,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,
@@ -866,15 +858,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/x11/iconcache.h b/src/x11/iconcache.h
index c6867c8..565bbff 100644
--- a/src/x11/iconcache.h
+++ b/src/x11/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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]