[mutter] iconcache: Remove commented out code



commit 5d124ac00a3be9e37f4b0932dad26af7a45384b7
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Jul 14 11:25:30 2014 -0400

    iconcache: Remove commented out code

 src/x11/iconcache.c |   43 -------------------------------------------
 1 files changed, 0 insertions(+), 43 deletions(-)
---
diff --git a/src/x11/iconcache.c b/src/x11/iconcache.c
index 9d6b009..d6dfb38 100644
--- a/src/x11/iconcache.c
+++ b/src/x11/iconcache.c
@@ -542,14 +542,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->wm_hints_dirty = TRUE;
   icon_cache->kwm_win_icon_dirty = TRUE;
   icon_cache->net_wm_icon_dirty = TRUE;
@@ -559,16 +551,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)
@@ -625,18 +607,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*
@@ -722,19 +692,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]