aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-format-html.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@novell.com>2004-05-15 01:46:24 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-05-15 01:46:24 +0800
commit6f58e91a1c07f49aec286eb0bc80d06622b174b0 (patch)
tree476e0a250b4471d80205f05e6145270ee751eaf8 /mail/em-format-html.c
parent951a1430928e5df1cfe053ce23e719ab46592df8 (diff)
downloadgsoc2013-evolution-6f58e91a1c07f49aec286eb0bc80d06622b174b0.tar
gsoc2013-evolution-6f58e91a1c07f49aec286eb0bc80d06622b174b0.tar.gz
gsoc2013-evolution-6f58e91a1c07f49aec286eb0bc80d06622b174b0.tar.bz2
gsoc2013-evolution-6f58e91a1c07f49aec286eb0bc80d06622b174b0.tar.lz
gsoc2013-evolution-6f58e91a1c07f49aec286eb0bc80d06622b174b0.tar.xz
gsoc2013-evolution-6f58e91a1c07f49aec286eb0bc80d06622b174b0.tar.zst
gsoc2013-evolution-6f58e91a1c07f49aec286eb0bc80d06622b174b0.zip
Same. Also changed the "Valid signature, cannot verify sender" string to
2004-05-14 Jeffrey Stedfast <fejj@novell.com> * em-format-html.c (efh_format_secure): Same. Also changed the "Valid signature, cannot verify sender" string to "Valid signature but cannot verify sender" as I think it reads nicer. * em-format-html-display.c (efhd_format_secure): Since signature status is a tri-state, use 3 different colours too (yellow for valid sig but unknown sender). svn path=/trunk/; revision=25906
Diffstat (limited to 'mail/em-format-html.c')
-rw-r--r--mail/em-format-html.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index c6ad7b0a4f..dbedb1bf0b 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -560,7 +560,7 @@ static const struct {
{ NULL, N_("Unsigned") },
{ "stock_signature-ok", N_("Valid signature") },
{ "stock_signature-bad", N_("Invalid signature") },
- { "stock_signature", N_("Valid signature, cannot verify sender") },
+ { "stock_signature", N_("Valid signature but cannot verify sender") },
};
static const struct {
@@ -572,6 +572,10 @@ static const struct {
{ "stock_lock-ok", N_("Encrypted, strong") },
};
+static const char *smime_sign_colour[4] = {
+ "", " bgcolor=\"#88bb88\"", " bgcolor=\"#bb8888\"", " bgcolor=\"#e8d122\""
+};
+
/* TODO: this could probably be virtual on em-format-html
then we only need one version of each type handler */
static void
@@ -589,10 +593,10 @@ efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel
char *classid;
char *iconpath;
CamelMimePart *iconpart;
-
- camel_stream_printf(stream, "<table border=0 width=\"100%%\" cellpadding=3 cellspacing=0 bgcolor=%s><tr>",
- valid->sign.status == CAMEL_CIPHER_VALIDITY_SIGN_GOOD?"#88bb88":"#bb8888");
-
+
+ camel_stream_printf (stream, "<table border=0 width=\"100%%\" cellpadding=3 cellspacing=0%s><tr>",
+ smime_sign_colour[valid->sign.status]);
+
classid = g_strdup_printf("smime:///em-format-html/%s/icon/signed", emf->part_id->str);
camel_stream_printf(stream, "<td valign=\"top\"><img src=\"%s\"></td><td valign=\"top\" width=\"100%%\">", classid);
iconpath = e_icon_factory_get_icon_filename (smime_sign_table[valid->sign.status].icon, E_ICON_SIZE_DIALOG);