* Fixes NB#87346 do not generate nested "Fw:" or "Re:"

[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 3cc3d16..a1a8299 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -267,6 +267,12 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
        gchar *address = NULL;
        gchar *subject = NULL;
        time_t date;
+
+#ifdef MAEMO_CHANGES
+#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT
+       GtkTreeCellDataHint hint;
+#endif
+#endif
        
        GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
                *attach_cell, *priority_cell,
@@ -278,6 +284,15 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
        g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (column));
        g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
        g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
+
+#ifdef MAEMO_CHANGES
+#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT
+       hint = gtk_tree_view_column_get_cell_data_hint (GTK_TREE_VIEW_COLUMN (column));
+
+       if (hint != GTK_TREE_CELL_DATA_HINT_ALL)
+               return;
+#endif
+#endif
        
        recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-renderer"));
        subject_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "subject-box-renderer"));
@@ -329,6 +344,7 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
         * theme (gtkrc file) */
        modest_text_utils_get_display_address (address); /* changed in-place */
        set_cell_text (recipient_cell, address, flags, RENDER_CELL_STYLE_GREY);
+       g_free (address);
        
        if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX) {
                ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN;