[mutter/meego-1.0: 8/30] Do not load fallback icons

[Tomas Frydrych <tomasf src gnome org>]

commit 66f964fb7521ee6674e0bc67db524a360630e0aa
Author: Tomas Frydrych <tf linux intel com>
Date:   Mon Jan 4 14:05:04 2010 +0000

    Do not load fallback icons
    
    Fallback window icons are useless (the whole point of the icons is to identify
    the window by them) and just waste resources.

 src/core/iconcache.c |    4 ++--
 src/core/window.c    |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/core/iconcache.c b/src/core/iconcache.c
index b3ec718..3d3cabb 100644
--- a/src/core/iconcache.c
+++ b/src/core/iconcache.c
@@ -519,8 +519,8 @@ 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->want_fallback = FALSE;
+  icon_cache->wm_hints_dirty = FALSE;
   icon_cache->kwm_win_icon_dirty = TRUE;
   icon_cache->net_wm_icon_dirty = TRUE;
 }
diff --git a/src/core/window.c b/src/core/window.c
index a849cd1..3327d9f 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -6384,8 +6384,10 @@ meta_window_update_icon_now (MetaWindow *window)
       redraw_icon (window);
     }
 
+#if 0
   g_assert (window->icon);
   g_assert (window->mini_icon);
+#endif
 }
 
 static gboolean