[metacity/simplify-iconcache: 2/5] iconcache: remove commented out code
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity/simplify-iconcache: 2/5] iconcache: remove commented out code
- Date: Thu, 19 Mar 2020 16:49:32 +0000 (UTC)
commit 28b04e6ae742beda2a19e771b810b947e740fad2
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Thu Mar 19 16:01:15 2020 +0200
iconcache: remove commented out code
src/core/iconcache.c | 43 -------------------------------------------
1 file changed, 43 deletions(-)
---
diff --git a/src/core/iconcache.c b/src/core/iconcache.c
index f5cddc87..66b8711e 100644
--- a/src/core/iconcache.c
+++ b/src/core/iconcache.c
@@ -497,14 +497,6 @@ meta_icon_cache_init (MetaIconCache *icon_cache)
icon_cache->origin = USING_NO_ICON;
icon_cache->prev_pixmap = 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->want_fallback = TRUE;
icon_cache->wm_hints_dirty = TRUE;
icon_cache->kwm_win_icon_dirty = TRUE;
@@ -515,16 +507,6 @@ static void
clear_icon_cache (MetaIconCache *icon_cache,
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;
if (dirty_all)
@@ -587,18 +569,6 @@ replace_cache (MetaIconCache *icon_cache,
clear_icon_cache (icon_cache, FALSE);
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*
@@ -684,19 +654,6 @@ meta_read_icons (MetaScreen *screen,
*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))
return FALSE; /* we have no new info to use */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]