From: Jose Dapena Paz <jdapena@igalia.com>
Date: Wed, 8 Apr 2009 15:43:06 +0000 (+0000)
Subject: Build diablo build and fix second line font size and color in maemo and gnome
X-Git-Tag: git_migration_finished~105
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=d8cca2763d3a9c9e46e827321a83bd26c40871e3;hp=3b5dc6fc08a4bb09b660ce6c777edc2e35fdcdfa

Build diablo build and fix second line font size and color in maemo and gnome

pmo-trunk-r8701
---

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 5fad32b..9fd2947 100644
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -479,7 +479,7 @@ get_transports (void)
 		gchar *from_string  = NULL;
 		if (account_name) {
 			from_string = modest_account_mgr_get_from_string (account_mgr,
-									  account_name);
+									  account_name, NULL);
 		}
 		
 		if (from_string && account_name) {
@@ -1627,7 +1627,7 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
 	/* don't free these (except from) */
 	data = g_slice_new0 (MsgData);
 	data->from    =  modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
-							     account_name);
+							     account_name, NULL);
 	data->account_name = g_strdup (account_name);
 	data->to      =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->to_field)));
 	data->cc      =  g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field)));
diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 2d30511..6bba7f1 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -1403,10 +1403,17 @@ modest_text_utils_get_display_date (time_t date)
 	/* if it's today, show the time, if it's not today, show the date instead */
 
 	/* TODO: take into account the system config for 24/12h */
+#ifdef MODEST_TOOLKIT_HILDON2
 	if (day == date_day) /* is the date today? */
 		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, _HL("wdgt_va_24h_time"), date);
 	else 
 		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, _HL("wdgt_va_date"), date); 
+#else
+	if (day == date_day) /* is the date today? */
+		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%X", date);
+	else 
+		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%x", date); 
+#endif
 
 	return date_buf; /* this is a static buffer, don't free! */
 }
diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index b0591d2..dec1973 100644
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -2402,6 +2402,19 @@ update_style (ModestHeaderView *self)
 			      "attributes", attr_list,
 			      NULL);
 		pango_attr_list_unref (attr_list);
+	} else {
+		g_object_set (G_OBJECT (priv->renderer_address),
+			      "foreground-gdk", &style_color,
+			      "foreground-set", TRUE,
+			      "scale", PANGO_SCALE_SMALL,
+			      "scale-set", TRUE,
+			      NULL);
+		g_object_set (G_OBJECT (priv->renderer_date_status),
+			      "foreground-gdk", &style_color,
+			      "foreground-set", TRUE,
+			      "scale", PANGO_SCALE_SMALL,
+			      "scale-set", TRUE,
+			      NULL);
 	}
 }