brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iconcache: Remove commented out code

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-07-14 11:25:30 -04:00
parent a57c3ae105
commit 5d124ac00a
1 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/x11/iconcache.c
View File

@ -542,14 +542,6 @@ meta_icon_cache_init (MetaIconCache *icon_cache)
icon_cache->origin = USING_NO_ICON; icon_cache->origin = USING_NO_ICON;
icon_cache->prev_pixmap = None; icon_cache->prev_pixmap = None;
icon_cache->prev_mask = None; icon_cache->prev_mask = None;
#if 0
icon_cache->icon = NULL;
icon_cache->mini_icon = NULL;
icon_cache->ideal_width = -1; /* won't be a legit width */
icon_cache->ideal_height = -1;
icon_cache->ideal_mini_width = -1;
icon_cache->ideal_mini_height = -1;
#endif
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;
@ -559,16 +551,6 @@ static void
clear_icon_cache (MetaIconCache *icon_cache, clear_icon_cache (MetaIconCache *icon_cache,
gboolean dirty_all) gboolean dirty_all)
{ {
#if 0
if (icon_cache->icon)
g_object_unref (G_OBJECT (icon_cache->icon));
icon_cache->icon = NULL;
if (icon_cache->mini_icon)
g_object_unref (G_OBJECT (icon_cache->mini_icon));
icon_cache->mini_icon = NULL;
#endif
icon_cache->origin = USING_NO_ICON; icon_cache->origin = USING_NO_ICON;
if (dirty_all) if (dirty_all)
@ -625,18 +607,6 @@ replace_cache (MetaIconCache *icon_cache,
clear_icon_cache (icon_cache, FALSE); clear_icon_cache (icon_cache, FALSE);
icon_cache->origin = origin; icon_cache->origin = origin;
#if 0
if (new_icon)
g_object_ref (G_OBJECT (new_icon));
icon_cache->icon = new_icon;
if (new_mini_icon)
g_object_ref (G_OBJECT (new_mini_icon));
icon_cache->mini_icon = new_mini_icon;
#endif
} }
static GdkPixbuf* static GdkPixbuf*
@ -722,19 +692,6 @@ meta_read_icons (MetaScreen *screen,
*iconp = NULL; *iconp = NULL;
*mini_iconp = NULL; *mini_iconp = NULL;
#if 0
if (ideal_width != icon_cache->ideal_width ||
ideal_height != icon_cache->ideal_height ||
ideal_mini_width != icon_cache->ideal_mini_width ||
ideal_mini_height != icon_cache->ideal_mini_height)
clear_icon_cache (icon_cache, TRUE);
icon_cache->ideal_width = ideal_width;
icon_cache->ideal_height = ideal_height;
icon_cache->ideal_mini_width = ideal_mini_width;
icon_cache->ideal_mini_height = ideal_mini_height;
#endif
if (!meta_icon_cache_get_icon_invalidated (icon_cache)) if (!meta_icon_cache_get_icon_invalidated (icon_cache))
return FALSE; /* we have no new info to use */ return FALSE; /* we have no new info to use */