* Fixed modest_text_utils_get_display_address, now the original string is not modifi...

[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..2f8b599 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -257,11 +257,14 @@ _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;
+       gchar *address, *display_address;
        gint sender_receiver_col;
 
        if (is_sender)
@@ -274,10 +277,12 @@ _modest_header_view_sender_receiver_cell_data  (GtkTreeViewColumn *column,  GtkC
                            TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
                            -1);
        
+       display_address = modest_text_utils_get_display_address (address);
        g_object_set (G_OBJECT(renderer),
                      "text",
-                     modest_text_utils_get_display_address (address),
+                     display_address,
                      NULL);
+       g_free (display_address);
        g_free (address);
        set_common_flags (renderer, flags);
 }
@@ -300,7 +305,7 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
        
        TnyHeaderFlags flags = 0;
        TnyHeaderFlags prior_flags = 0;
-       gchar *address = NULL;
+       gchar *address = NULL, *display_address;
        gchar *subject = NULL;
        gchar *header = NULL;
        time_t date = 0;
@@ -371,10 +376,12 @@ _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) */
+       display_address = 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));
+                                         display_address);
+       g_free (display_address);
        g_free (address);
-       address = NULL;
+       address = display_address = NULL;
        g_object_set (G_OBJECT (recipient_cell),
                      "markup", header,
                      NULL);