X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view-render.c;h=622675165295ab94deec8793a8d49cce76b0affc;hb=0c46a692d7b9a41ff219874752172b6f7aa3a804;hp=e0b128d8a79c69ee17770a46606a00f3965536af;hpb=51599182dd639c256fea10a3648db2c42baa677b;p=modest

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index e0b128d..6226751 100644
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -40,7 +40,7 @@
 #include <string.h>
 
 
-void 
+static void 
 fill_list_of_caches (gpointer key, gpointer value, gpointer userdata)
 {
 	GSList **send_queues = (GSList **) userdata;
@@ -128,11 +128,11 @@ get_pixbuf_for_flag (TnyHeaderFlags flag)
 		return attachments_pixbuf;
 	case TNY_HEADER_FLAG_HIGH_PRIORITY:
 		if (G_UNLIKELY(!high_pixbuf))
-			high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH_PRIORITY);
+			high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH);
 		return high_pixbuf;
 	case TNY_HEADER_FLAG_LOW_PRIORITY:
 		if (G_UNLIKELY(!low_pixbuf))
-			low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW_PRIORITY);
+			low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW);
 		return low_pixbuf;
 	default:
 		if (G_UNLIKELY(!unread_pixbuf))
@@ -259,14 +259,25 @@ void
 _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
 					       GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
 {
-	TnyHeaderFlags flags, prior_flags;
-	gchar *address, *subject, *header;
-	time_t date;
-	ModestHeaderViewCompactHeaderMode header_mode;
+	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));
+	
+	/* Note that GtkTreeModel is a GtkTreeModelFilter. */
+	
+	/* printf ("DEBUG: %s: tree_model gtype=%s\n", __FUNCTION__, G_OBJECT_TYPE_NAME (tree_model)); */
+	
+	TnyHeaderFlags flags = 0;
+	TnyHeaderFlags prior_flags = 0;
+	gchar *address = NULL;
+	gchar *subject = NULL;
+	gchar *header = NULL;
+	time_t date = 0;
+	
 	GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
 		*attach_cell, *priority_cell,
-		*recipient_box, *subject_box;
-	TnyHeader *msg_header;
+		*recipient_box, *subject_box = NULL;
+	TnyHeader *msg_header = NULL;
 	gchar *display_date = NULL, *tmp_date = NULL;
 
 	recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-renderer"));
@@ -277,7 +288,7 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 	recipient_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "recipient-renderer"));
 	date_or_status_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "date-renderer"));
 
-	header_mode = GPOINTER_TO_INT (user_data); 
+	ModestHeaderViewCompactHeaderMode header_mode = GPOINTER_TO_INT (user_data); 
 
 	if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_IN)
 		gtk_tree_model_get (tree_model, iter,
@@ -322,11 +333,10 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 	/* fixme: we hardcode the color to #666666; instead we should use SecundaryTextColour from the
 	 * theme (gtkrc file) */
 	
-	header = g_markup_printf_escaped ("<small>%s</small>", 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));
 	g_free (address);
 	g_object_set (G_OBJECT (recipient_cell),
 		      "markup", header,
-		      "foreground", "#666666",
 		      NULL);
 	g_free (header);
 	set_common_flags (recipient_cell, flags);
@@ -344,10 +354,9 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 /* 				status = MODEST_TNY_SEND_QUEUE_SUSPENDED; */
 		}
 		status_str = get_status_string (status);
-		display_date = g_strdup_printf("<small>%s</small>", status_str);
+		display_date = g_strdup_printf("<span size='small' foreground='#666666'>%s</span>", status_str);
 		g_object_set (G_OBJECT (date_or_status_cell),
 			      "markup", display_date,
-			      "foreground", "#666666",
 			      NULL);
 		g_free (display_date);
 	} else {
@@ -359,14 +368,15 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 		else
 			tmp_date = g_strdup ("");
 		
-		display_date = g_strdup_printf ("<small>%s</small>", tmp_date);
+		display_date = g_strdup_printf ("<span size='small' foreground='#666666'>%s</span>", tmp_date);
 		g_object_set (G_OBJECT (date_or_status_cell),
 			      "markup", display_date,
-			      "foreground", "#666666",
 			      NULL);
 		g_free (tmp_date);
 		g_free (display_date);
 	}
+	if (msg_header != NULL)
+		g_object_unref (msg_header);
 	set_common_flags (date_or_status_cell, flags);
 }