* get rid of our icon caches, use gtk's; now icons are displayed

  again in the header view

pmo-trunk-r1537

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 78a026d..c2c3760 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -247,41 +247,27 @@ static GdkPixbuf*
 get_cached_icon (const gchar *name)
 {
        GError *err = NULL;
-       gpointer pixbuf;
-       gpointer orig_key;
-       static GHashTable *icon_cache = NULL;
-       
-       g_return_val_if_fail (name, NULL);
-
-       if (G_UNLIKELY(!icon_cache))
-               icon_cache = modest_cache_mgr_get_cache (modest_runtime_get_cache_mgr(),
-                                                        MODEST_CACHE_MGR_CACHE_TYPE_PIXBUF);
-       
-       if (!icon_cache || !g_hash_table_lookup_extended (icon_cache, name, &orig_key, &pixbuf)) {
-
+       GdkPixbuf* pixbuf;
+               
 #ifdef MODEST_PLATFORM_GNOME  
-               pixbuf = (gpointer) gdk_pixbuf_new_from_file (name, &err);
+       pixbuf = gdk_pixbuf_new_from_file (name, &err);
 #else
-               GtkIconTheme *current_theme;
-               current_theme = gtk_icon_theme_get_default ();
-               pixbuf = gtk_icon_theme_load_icon (current_theme,
-                                                  name,
-                                                  26,
-                                                  GTK_ICON_LOOKUP_NO_SVG,
-                                                  NULL);
+       GtkIconTheme *current_theme;
+       current_theme = gtk_icon_theme_get_default ();
+       pixbuf = gtk_icon_theme_load_icon (current_theme,
+                                          name,
+                                          26,
+                                          GTK_ICON_LOOKUP_NO_SVG,
+                                          &err);
 #endif /*MODEST_PLATFORM_GNOME*/
 
-               if (!pixbuf) {
-                       g_printerr ("modest: error in icon factory while loading '%s': %s\n",
-                                   name, err->message);
-                       g_error_free (err);
-               }
-               /* if we cannot find it, we still insert (if we have a cache), so we get the error
-                * only once */
-               if (icon_cache)
-                       g_hash_table_insert (icon_cache, g_strdup(name),(gpointer)pixbuf);
+       if (!pixbuf) {
+               g_printerr ("modest: error in icon factory while loading '%s': %s\n",
+                           name, err->message);
+               g_error_free (err);
        }
-       return GDK_PIXBUF(pixbuf);
+       
+       return pixbuf;
 }
 
 

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index 2b2d6ad..70bcb2e 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -34,37 +34,35 @@
 #include <modest-runtime.h>
 #include <glib/gi18n.h>
 
+
 static GdkPixbuf*
 get_cached_icon (const gchar *name)
 {
        GError *err = NULL;
-       gpointer pixbuf;
-       gpointer orig_key;
-       static GHashTable *icon_cache = NULL;
-       
-       g_return_val_if_fail (name, NULL);
+       GdkPixbuf* pixbuf;
+               
+#ifdef MODEST_PLATFORM_GNOME  
+       pixbuf = gdk_pixbuf_new_from_file (name, &err);
+#else
+       GtkIconTheme *current_theme;
+       current_theme = gtk_icon_theme_get_default ();
+       pixbuf = gtk_icon_theme_load_icon (current_theme,
+                                          name,
+                                          26,
+                                          GTK_ICON_LOOKUP_NO_SVG,
+                                          &err);
+#endif /*MODEST_PLATFORM_GNOME*/
 
-       if (G_UNLIKELY(!icon_cache))
-               icon_cache = modest_cache_mgr_get_cache (modest_runtime_get_cache_mgr(),
-                                                        MODEST_CACHE_MGR_CACHE_TYPE_PIXBUF);
-       
-       if (!icon_cache || !g_hash_table_lookup_extended (icon_cache, name, &orig_key,&pixbuf)) {
-               pixbuf = (gpointer)gdk_pixbuf_new_from_file (name, &err);
-               if (!pixbuf) {
-                       g_printerr ("modest: error while loading '%s': %s\n",
-                                   name, err->message);
-                       g_error_free (err);
-               }
-               /* if we cannot find it, we still insert (if we have a cache), so we get the error
-                * only once */
-               if (icon_cache)
-                       g_hash_table_insert (icon_cache, g_strdup(name),(gpointer)pixbuf);
+       if (!pixbuf) {
+               g_printerr ("modest: error in icon factory while loading '%s': %s\n",
+                           name, err->message);
+               g_error_free (err);
        }
-       return GDK_PIXBUF(pixbuf);
+       
+       return pixbuf;
 }
 
 
-
 /*
  * optimization
  */