* Added asynchronous account update

[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 70d6ab7..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,9 +74,11 @@ get_pixbuf_for_compact_flag (TnyHeaderFlags flags)
        static GdkPixbuf *low_attachments_pixbuf    = NULL;
        static GdkPixbuf *high_pixbuf               = NULL;
        static GdkPixbuf *low_pixbuf                = NULL;
-       TnyHeaderFlags prior;
+       static GdkPixbuf *normal_pixbuf             = NULL;
 
-       prior = flags & TNY_HEADER_FLAG_HIGH_PRIORITY;
+       TnyHeaderPriorityFlags prior;
+
+       prior = flags & TNY_HEADER_FLAG_PRIORITY;
        switch (prior) {
        case TNY_HEADER_FLAG_HIGH_PRIORITY:
                if (flags & TNY_HEADER_FLAG_ATTACHMENTS) {
@@ -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;
 }
 
@@ -166,8 +172,7 @@ _modest_header_view_compact_flag_cell_data (GtkTreeViewColumn *column, GtkCellRe
                            &flags, -1);
        
        pixbuf = get_pixbuf_for_compact_flag (flags);
-       //if (pixbuf != NULL)
-               g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
+       g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
 }
 
 void
@@ -297,10 +302,11 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
                                    TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &date,   
                                    -1);
+
        rendobj = G_OBJECT(renderer);
        header = g_markup_printf_escaped ("%s\n<small>%s</small>",
-                                         subject ? subject : _("mail_va_no_subject"),
-                                         address);
+                                         (subject && strlen(subject)) ? subject : _("mail_va_no_subject"),
+                                         modest_text_utils_get_display_address(address));
        g_free (address);
        g_free (subject);
 
@@ -335,8 +341,8 @@ _modest_header_view_size_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
 
 void
 _modest_header_view_status_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                                    GtkTreeModel *tree_model,  GtkTreeIter *iter,
-                                    gpointer user_data)
+                                      GtkTreeModel *tree_model,  GtkTreeIter *iter,
+                                      gpointer user_data)
 {
         TnyHeaderFlags flags;
        //guint status;