* 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 019ab32..1625a94 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -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);
 }
 /*
@@ -371,10 +376,10 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 
        /* 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);