* get rid of warnings for a missing icon

pmo-trunk-r3049

diff --git a/src/maemo/modest-icon-names.h b/src/maemo/modest-icon-names.h
index 701fa35..a6ff248 100644 (file)
--- a/src/maemo/modest-icon-names.h
+++ b/src/maemo/modest-icon-names.h
@@ -41,7 +41,7 @@
 #define MODEST_APP_MSG_EDIT_ICON               "qgn_list_messagin_editor"
 
 #define MODEST_HEADER_ICON_READ                        "qgn_list_messagin_mail"
-#define MODEST_HEADER_ICON_UNREAD              "qgn_list_messagin_mail_unread"
+#define MODEST_HEADER_ICON_UNREAD              ""
 #define MODEST_HEADER_ICON_DELETED             "qgn_list_messagin_mail_deleted"
 #define MODEST_HEADER_ICON_ATTACH              "qgn_list_gene_attacpap"
 #define MODEST_HEADER_ICON_HIGH                        "qgn_list_messaging_high"

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index f863fa4..ffe1cee 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -525,6 +525,12 @@ modest_platform_get_icon (const gchar *name)
 
        g_return_val_if_fail (name, NULL);
 
+       /* strlen == 0 is not really an error; it just
+        * means the icon is not available
+        */
+       if (!name || strlen(name) == 0)
+               return NULL;
+       
 #if 0 /* do we still need this? */
        if (g_str_has_suffix (name, ".png")) { /*FIXME: hack*/
                pixbuf = gdk_pixbuf_new_from_file (name, &err);