X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-compact-mail-header-view.c;h=c899c6acbfc066a691116c8fe5736b36afc6c4b0;hb=5944d6567845df01c4058178c9e87a80fa0c2019;hp=9a6f74c26cdb9b3f71eff33ce28da11b112d3d5e;hpb=e0b5c4c6a52f30bc4d088a0d751bf03d90c42985;p=modest

diff --git a/src/widgets/modest-compact-mail-header-view.c b/src/widgets/modest-compact-mail-header-view.c
index 9a6f74c..c899c6a 100644
--- a/src/widgets/modest-compact-mail-header-view.c
+++ b/src/widgets/modest-compact-mail-header-view.c
@@ -134,7 +134,7 @@ set_date_time (ModestCompactMailHeaderView *compact_mail_header)
 		gchar date_buf[BUF_SIZE];
 		GString *buffer = g_string_new ("");
 
-		modest_text_utils_strftime (date_buf, BUF_SIZE, _HL("wdgt_va_week"), priv->date_to_show);
+		modest_text_utils_strftime (date_buf, BUF_SIZE, _HL_WEEK, priv->date_to_show);
 		buffer = g_string_append (buffer, date_buf);
 		buffer = g_string_append_c (buffer, ' ');
 		buffer = g_string_append_unichar (buffer, 0x2015);
@@ -144,7 +144,7 @@ set_date_time (ModestCompactMailHeaderView *compact_mail_header)
 		gtk_label_set_text (GTK_LABEL (priv->time_label), buffer->str);
 		g_string_free  (buffer, TRUE);
 		buffer = g_string_new ("");
-		modest_text_utils_strftime (date_buf, BUF_SIZE, _HL("wdgt_va_date_medium"), priv->date_to_show);
+		modest_text_utils_strftime (date_buf, BUF_SIZE, _HL_DATE_MEDIUM, priv->date_to_show);
 		buffer = g_string_append (buffer, date_buf);
 
 		gtk_label_set_text (GTK_LABEL (priv->date_label), buffer->str);
@@ -692,17 +692,16 @@ update_style (ModestCompactMailHeaderView *self)
 	PangoColor color;
 	PangoAttrList *attr_list;
 	GSList *node;
-	GdkColor bg_color;
 
 	g_return_if_fail (MODEST_IS_COMPACT_MAIL_HEADER_VIEW (self));
 	priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self);
 
-	if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
+	if (gtk_style_lookup_color (gtk_widget_get_style (GTK_WIDGET (self)), "SecondaryTextColor", &style_color)) {
 		color.red = style_color.red;
 		color.green = style_color.green;
 		color.blue = style_color.blue;
 	} else {
-		if (!pango_color_parse (&color, "grey")) {
+		if (!pango_color_parse (&color, MODEST_SECONDARY_COLOR)) {
 			g_warning ("Failed to parse color grey");
 			color.red = 0xc0c0;
 			color.green = 0xc0c0;
@@ -733,9 +732,11 @@ update_style (ModestCompactMailHeaderView *self)
 	pango_attr_list_unref (attr_list);
 
 #ifdef MODEST_COMPACT_HEADER_BG
+	GdkColor bg_color;
+
 	gdk_color_parse (MODEST_COMPACT_HEADER_BG, &bg_color);
-#endif
 	gtk_widget_modify_bg (GTK_WIDGET (priv->event_box), GTK_STATE_NORMAL, &bg_color);
+#endif
 }
 
 static void