From 7a6be11ea62647cba65625b2f65b944f22e65288 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 20 Oct 2013 11:15:41 -0400 Subject: Miscellaeous cleanups. --- mail/e-mail-display.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'mail/e-mail-display.c') diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index d4a0277d56..624e640cb1 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -825,20 +825,24 @@ toggle_address_visibility (WebKitDOMElement *button, static void add_color_css_rule_for_web_view (EWebView *view, - const char *color_name, - const char *color_value) + const gchar *color_name, + const gchar *color_value) { gchar *selector; gchar *style; selector = g_strconcat (".-e-mail-formatter-", color_name, NULL); - if (g_strstr_len (color_name, -1, "header")) - style = g_strconcat ("color: ", color_value, " !important;", NULL); - else if (g_strstr_len (color_name, -1, "frame")) - style = g_strconcat ("border-color: ", color_value, " !important;", NULL); - else - style = g_strconcat ("background-color: ", color_value, " !important;", NULL); + if (g_strstr_len (color_name, -1, "header")) { + style = g_strconcat ( + "color: ", color_value, " !important;", NULL); + } else if (g_strstr_len (color_name, -1, "frame")) { + style = g_strconcat ( + "border-color: ", color_value, " !important;", NULL); + } else { + style = g_strconcat ( + "background-color: ", color_value, " !important;", NULL); + } e_web_view_add_css_rule_into_style_sheet ( view, @@ -854,10 +858,16 @@ static void initialize_web_view_colors (EMailDisplay *display) { EMailFormatter *formatter; - const gchar *color_names [] = { "body-color", "citation-color", - "frame-color", "header-color", NULL }; gint ii; + const gchar *color_names[] = { + "body-color", + "citation-color", + "frame-color", + "header-color", + NULL + }; + formatter = e_mail_display_get_formatter (display); for (ii = 0; color_names[ii]; ii++) { -- cgit v1.2.3