* src/widgets/modest-msg-view.c:

[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 e0b128d..e8dfe27 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -128,11 +128,11 @@ get_pixbuf_for_flag (TnyHeaderFlags flag)
                return attachments_pixbuf;
        case TNY_HEADER_FLAG_HIGH_PRIORITY:
                if (G_UNLIKELY(!high_pixbuf))
-                       high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH_PRIORITY);
+                       high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH);
                return high_pixbuf;
        case TNY_HEADER_FLAG_LOW_PRIORITY:
                if (G_UNLIKELY(!low_pixbuf))
-                       low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW_PRIORITY);
+                       low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW);
                return low_pixbuf;
        default:
                if (G_UNLIKELY(!unread_pixbuf))
@@ -266,7 +266,7 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
        GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
                *attach_cell, *priority_cell,
                *recipient_box, *subject_box;
-       TnyHeader *msg_header;
+       TnyHeader *msg_header = NULL;
        gchar *display_date = NULL, *tmp_date = NULL;
 
        recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-renderer"));
@@ -322,11 +322,10 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
        /* fixme: we hardcode the color to #666666; instead we should use SecundaryTextColour from the
         * theme (gtkrc file) */
        
-       header = g_markup_printf_escaped ("<small>%s</small>", modest_text_utils_get_display_address (address));
+       header = g_markup_printf_escaped ("<span size='small' foreground='#666666'>%s</span>", modest_text_utils_get_display_address (address));
        g_free (address);
        g_object_set (G_OBJECT (recipient_cell),
                      "markup", header,
-                     "foreground", "#666666",
                      NULL);
        g_free (header);
        set_common_flags (recipient_cell, flags);
@@ -344,10 +343,9 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 /*                             status = MODEST_TNY_SEND_QUEUE_SUSPENDED; */
                }
                status_str = get_status_string (status);
-               display_date = g_strdup_printf("<small>%s</small>", status_str);
+               display_date = g_strdup_printf("<span size='small' foreground='#666666'>%s</span>", status_str);
                g_object_set (G_OBJECT (date_or_status_cell),
                              "markup", display_date,
-                             "foreground", "#666666",
                              NULL);
                g_free (display_date);
        } else {
@@ -359,14 +357,15 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
                else
                        tmp_date = g_strdup ("");
                
-               display_date = g_strdup_printf ("<small>%s</small>", tmp_date);
+               display_date = g_strdup_printf ("<span size='small' foreground='#666666'>%s</span>", tmp_date);
                g_object_set (G_OBJECT (date_or_status_cell),
                              "markup", display_date,
-                             "foreground", "#666666",
                              NULL);
                g_free (tmp_date);
                g_free (display_date);
        }
+       if (msg_header != NULL)
+               g_object_unref (msg_header);
        set_common_flags (date_or_status_cell, flags);
 }