* modest-icon-factory.[ch]:

	- remove the small icon stuff

pmo-trunk-r718

diff --git a/src/modest-icon-factory.c b/src/modest-icon-factory.c
index 326705b..a577cd6 100644 (file)
--- a/src/modest-icon-factory.c
+++ b/src/modest-icon-factory.c
@@ -79,30 +79,3 @@ modest_icon_factory_get_icon (const gchar *name)
 }
 
 
-
-GdkPixbuf*
-modest_icon_factory_get_icon_at_size (const gchar *name, guint width, guint height)
-{
-       /* FIXME, somehow, cache scaled icons as well... */
-       GError *err = NULL;
-       GdkPixbuf *pixbuf = NULL;
-       static GHashTable *icon_cache = NULL;
-       
-       g_return_val_if_fail (name, NULL);
-
-       if (G_UNLIKELY(!icon_cache))
-               icon_cache = get_icon_cache ();
-       
-       pixbuf = gdk_pixbuf_new_from_file_at_size (name, width, height, &err);
-       if (!pixbuf) {
-               g_printerr ("modest: error in icon factory while loading '%s'@(%dx%d): %s\n",
-                           name, width, height, err->message);
-               g_error_free (err);
-       }
-       
-       /* we insert it, so it will be freed... FIXME... */
-       if (pixbuf && icon_cache)
-               g_hash_table_insert (icon_cache, g_strdup_printf ("%s-%d-%d",name,width,height),
-                                    (gpointer)pixbuf);
-       return pixbuf;
-}

diff --git a/src/modest-icon-factory.h b/src/modest-icon-factory.h
index f77e255..d1d7308 100644 (file)
--- a/src/modest-icon-factory.h
+++ b/src/modest-icon-factory.h
@@ -44,20 +44,4 @@
  */
 GdkPixbuf* modest_icon_factory_get_icon (const gchar *name);
 
-/**
- * modest_icon_factory_get_icon_at_size:
- * @name: the filename of a certain icon
- * @width: the desired width of the icon
- * @height: the desired height of the icon
- *
- * Returns: a GdkPixBuf for this icon, or NULL in case of error
- * You should NOT unref or modify the pixbuf in any way
- */
-GdkPixbuf* modest_icon_factory_get_icon_at_size (const gchar *name, guint width, guint height);
-
-/* FIXME */
-#define modest_icon_factory_get_small_icon(n) modest_icon_factory_get_icon_at_size(n,16,16)
-#define modest_icon_factory_get_big_icon(n)   modest_icon_factory_get_icon_at_size(n,24,24)
-
-
 #endif /*__MODEST_ICON_FACTORY_H__ */