X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view-render.c;h=9b030939eed9e85fde6b528d57d548b6b4bd5afb;hb=71af7294c7147e8a1acf8b8e655e7005127fc2bd;hp=df8f9a0038fa71a410ea195ec959c6b36ab7a4aa;hpb=c7d97f3f8158d317bd5fa78fbb91277a1c3b7555;p=modest

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index df8f9a0..9b03093 100644
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -136,11 +136,11 @@ set_cell_text (GtkCellRenderer *renderer,
 	weight =  (flags & TNY_HEADER_FLAG_SEEN) ? PANGO_WEIGHT_NORMAL: PANGO_WEIGHT_ULTRABOLD;
 	strikethrough = (flags & TNY_HEADER_FLAG_DELETED) ?  TRUE:FALSE;
 	g_object_freeze_notify (G_OBJECT (renderer));
-	g_object_set (G_OBJECT (renderer), "text", text, NULL);
-	if (!(flags & TNY_HEADER_FLAG_SEEN))
-		g_object_set (G_OBJECT (renderer), "weight", PANGO_WEIGHT_ULTRABOLD, NULL);
-	if (flags & TNY_HEADER_FLAG_DELETED)
-		g_object_set (G_OBJECT (renderer), "strikethrough", TRUE, NULL);
+	g_object_set (G_OBJECT (renderer), 
+		      "text", text, 
+		      "weight", (flags & TNY_HEADER_FLAG_SEEN) ? PANGO_WEIGHT_NORMAL : PANGO_WEIGHT_ULTRABOLD,
+		      "strikethrough", (flags &TNY_HEADER_FLAG_DELETED) ? TRUE : FALSE,
+		      NULL);
 	switch (style) {
 	case RENDER_CELL_STYLE_GREY:
 		g_object_set (G_OBJECT (renderer), 
@@ -154,27 +154,6 @@ set_cell_text (GtkCellRenderer *renderer,
 	g_object_thaw_notify (G_OBJECT (renderer));
 }
 
-
-void
-_modest_header_view_msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
-		   GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
-{
-	TnyHeaderFlags flags;
-		
-	gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
-			    &flags, -1);
-
-	if (flags & TNY_HEADER_FLAG_DELETED)
-		g_object_set (G_OBJECT (renderer), "pixbuf",
-			      get_pixbuf_for_flag (TNY_HEADER_FLAG_DELETED), NULL);	      
-	else if (flags & TNY_HEADER_FLAG_SEEN)
-		g_object_set (G_OBJECT (renderer), "pixbuf",
-			      get_pixbuf_for_flag (TNY_HEADER_FLAG_SEEN), NULL);	      
-	else 
-		g_object_set (G_OBJECT (renderer), "pixbuf",
-			      get_pixbuf_for_flag (0), NULL); /* ughh, FIXME */		      
-}
-
 void
 _modest_header_view_attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
 				      GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
@@ -267,6 +246,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 +263,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 +323,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;