* revert to the in-place 'modest_text_utils_get_display_address',

[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 c7fc54b..1625a94 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -60,8 +60,8 @@ get_status_of_uid (TnyHeader *header)
        TnyTransportAccount *account = NULL;
        GSList *send_queues = NULL, *node;
        /* get_msg_status returns suspended by default, so we want to detect changes */
-       ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_SUSPENDED;
-       ModestTnySendQueueStatus queue_status = MODEST_TNY_SEND_QUEUE_SUSPENDED;
+       ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNONW;
+       ModestTnySendQueueStatus queue_status = MODEST_TNY_SEND_QUEUE_UNKNONW;
        gchar *msg_uid = NULL;
        ModestTnySendQueue *send_queue = NULL;
        
@@ -257,8 +257,11 @@ _modest_header_view_date_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
 }
 
 void
-_modest_header_view_sender_receiver_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                           GtkTreeModel *tree_model,  GtkTreeIter *iter,  gboolean is_sender)
+_modest_header_view_sender_receiver_cell_data  (GtkTreeViewColumn *column,  
+                                               GtkCellRenderer *renderer,
+                                               GtkTreeModel *tree_model,  
+                                               GtkTreeIter *iter,  
+                                               gboolean is_sender)
 {
        TnyHeaderFlags flags;
        gchar *address;
@@ -274,11 +277,13 @@ _modest_header_view_sender_receiver_cell_data  (GtkTreeViewColumn *column,  GtkC
                            TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
                            -1);
        
+       modest_text_utils_get_display_address (address); /* string is changed in-place */
        g_object_set (G_OBJECT(renderer),
                      "text",
-                     modest_text_utils_get_display_address (address),
+                     address,
                      NULL);
        g_free (address);
+
        set_common_flags (renderer, flags);
 }
 /*
@@ -356,18 +361,25 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
                              NULL, NULL);
 
 
-       g_object_set (G_OBJECT (subject_cell), "markup",
-                     (subject && strlen (subject)) ? subject : _("mail_va_no_subject"),
-                     NULL);
+       if (subject && strlen (subject)) {
+               gchar* escaped_subject = g_markup_escape_text (subject, -1);
+               g_object_set (G_OBJECT (subject_cell), "markup",
+                             escaped_subject, NULL);
+               g_free (escaped_subject);
+       } else {
+               g_object_set (G_OBJECT (subject_cell), "markup",
+                             _("mail_va_no_subject"), NULL);
+       }
+
        g_free (subject);
        set_common_flags (subject_cell, flags);
 
        /* FIXME: we hardcode the color to #666666; instead we should use SecondaryTextColour from the
         * theme (gtkrc file) */
+       modest_text_utils_get_display_address (address); /* changed in-place */
        header = g_markup_printf_escaped ("<span size='small' foreground='#666666'>%s</span>",
-                                         modest_text_utils_get_display_address (address));
+                                         address);
        g_free (address);
-       address = NULL;
        g_object_set (G_OBJECT (recipient_cell),
                      "markup", header,
                      NULL);
@@ -376,7 +388,7 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
        set_common_flags (recipient_cell, flags);
 
        if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX) {
-               ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_WAITING;
+               ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNONW;
                const gchar *status_str = "";
                if (msg_header != NULL) {
                        status = get_status_of_uid (msg_header);
@@ -384,8 +396,6 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
                                tny_header_unset_flags (msg_header, TNY_HEADER_FLAG_PRIORITY);
                                tny_header_set_flags (msg_header, TNY_HEADER_FLAG_SUSPENDED_PRIORITY);
                        }
-/*                     if (prior_flags == TNY_HEADER_FLAG_SUSPENDED_PRIORITY) */
-/*                             status = MODEST_TNY_SEND_QUEUE_SUSPENDED; */
                }
                
                status_str = get_status_string (status);