2007-05-24 Murray Cumming <murrayc@murrayc.com>

[modest] / src / widgets / modest-header-view-render.c

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index 5aa1585..80158e0 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -34,6 +34,7 @@
 #include <modest-runtime.h>
 #include <glib/gi18n.h>
 #include <modest-platform.h>
+#include <string.h>
 
 static GdkPixbuf*
 get_pixbuf_for_flag (TnyHeaderFlags flag)
@@ -73,6 +74,8 @@ get_pixbuf_for_compact_flag (TnyHeaderFlags flags)
        static GdkPixbuf *low_attachments_pixbuf    = NULL;
        static GdkPixbuf *high_pixbuf               = NULL;
        static GdkPixbuf *low_pixbuf                = NULL;
+       static GdkPixbuf *normal_pixbuf             = NULL;
+
        TnyHeaderPriorityFlags prior;
 
        prior = flags & TNY_HEADER_FLAG_PRIORITY;
@@ -104,9 +107,12 @@ get_pixbuf_for_compact_flag (TnyHeaderFlags flags)
                        if (G_UNLIKELY(!normal_attachments_pixbuf))
                                normal_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_NORM_PRIORITY);
                        return normal_attachments_pixbuf;
-               }               
+               } else {                
+                       if (G_UNLIKELY(!normal_pixbuf))
+                               normal_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_NORM_PRIORITY);
+                       return normal_pixbuf;
+               }
        }
-
        return NULL;
 }
 
@@ -299,7 +305,7 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 
        rendobj = G_OBJECT(renderer);
        header = g_markup_printf_escaped ("%s\n<small>%s</small>",
-                                         subject ? subject : _("mail_va_no_subject"),
+                                         (subject && strlen(subject)) ? subject : _("mail_va_no_subject"),
                                          modest_text_utils_get_display_address(address));
        g_free (address);
        g_free (subject);