* Added support to asynchronously update an account

[modest] / src / modest-icon-factory.c

diff --git a/src/modest-icon-factory.c b/src/modest-icon-factory.c
index 95b7a96..c1902a2 100644 (file)
--- a/src/modest-icon-factory.c
+++ b/src/modest-icon-factory.c
@@ -53,11 +53,11 @@ void
 modest_icon_factory_init   (void)
 {
        if (icon_hash) {
-               g_warning ("modest_icon_factory_init "
-                          "should be called only once");
+               g_printerr ("modest: modest_icon_factory_init " 
+                           "should be called only once\n");
                return;
        }
-
+       
        icon_hash = g_hash_table_new_full (g_str_hash,
                                           (GEqualFunc)equal_func,
                                           (GDestroyNotify)g_free,
@@ -69,9 +69,9 @@ void
 modest_icon_factory_uninit (void)
 {
        if (!icon_hash) {
-               g_warning ("modest_icon_factory_uninit "
+               g_printerr ("modest: modest_icon_factory_uninit "
                           "must only be called with initialized "
-                          "ModestIconFactories");
+                          "ModestIconFactories\n");
                return;
        }
 
@@ -87,9 +87,11 @@ modest_icon_factory_get_icon (const gchar *name)
        GError *err = NULL;
        GdkPixbuf *pixbuf;
        gpointer orig_key;
+
+       g_return_val_if_fail (name, NULL);
        
        if (!icon_hash) {
-               g_warning ("ModestIconFactory must be initialized first");
+               g_printerr ("modest: ModestIconFactory must be initialized first\n");
                return NULL;
        }
 
@@ -100,7 +102,8 @@ modest_icon_factory_get_icon (const gchar *name)
                                           (gpointer*)&pixbuf)) {
                pixbuf = gdk_pixbuf_new_from_file (name, &err);
                if (!pixbuf) {
-                       g_warning (err->message);
+                       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, so we get the error
@@ -110,3 +113,34 @@ modest_icon_factory_get_icon (const gchar *name)
        }
        return pixbuf;
 }
+
+
+
+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;
+
+       g_return_val_if_fail (name, NULL);
+       
+       if (!icon_hash) {
+               g_printerr ("modest: ModestIconFactory must be initialized first\n");
+               return NULL;
+       }
+
+       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)
+               g_hash_table_insert (icon_hash, g_strdup_printf ("%s-%d-%d",name,width,height),
+                                    (gpointer)pixbuf);
+       
+       return pixbuf;
+}