diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-05-19 12:45:45 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-05-19 12:45:45 +0800 |
| commit | 1f24a7b807ce7e466971f5c75ee4d43e4dab37a3 (patch) | |
| tree | 0e6aafe77b2617e420c10ad617244ffe20fc9e7c /mail/em-format-html.c | |
| parent | e4b42c5e6cfdc6fd2f9245fa61fd4e1f7b2038f6 (diff) | |
| download | gsoc2013-evolution-1f24a7b807ce7e466971f5c75ee4d43e4dab37a3.tar.gz gsoc2013-evolution-1f24a7b807ce7e466971f5c75ee4d43e4dab37a3.tar.zst gsoc2013-evolution-1f24a7b807ce7e466971f5c75ee4d43e4dab37a3.zip | |
make this match the efhd stuff.
2004-05-19 Not Zed <NotZed@Ximian.com>
* em-format-html.c (efh_format_secure): make this match the efhd
stuff.
* em-format-html-display.c: removed stock_signature-nokey since it
doesn't exist in gnome-icon-theme.
(efhd_xpkcs7mime_button): if there is no signing, but encryption,
use its icon. if there's no encryption too, use a broken icon
(?).
svn path=/trunk/; revision=25973
Diffstat (limited to 'mail/em-format-html.c')
| -rw-r--r-- | mail/em-format-html.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/mail/em-format-html.c b/mail/em-format-html.c index c135447300..f2d346378a 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -558,7 +558,7 @@ efh_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTML *efh) static const struct { const char *icon, *shortdesc; } smime_sign_table[4] = { - { NULL, N_("Unsigned") }, + { "stock_signature-bad", N_("Unsigned") }, { "stock_signature-ok", N_("Valid signature") }, { "stock_signature-bad", N_("Invalid signature") }, { "stock_signature", N_("Valid signature but cannot verify sender") }, @@ -567,8 +567,8 @@ static const struct { static const struct { const char *icon, *shortdesc; } smime_encrypt_table[4] = { - { NULL, N_("Unencrypted") }, - { "stock_lock-ok", N_("Encrypted, weak"),}, + { "stock_lock-broken", N_("Unencrypted") }, + { "stock_lock", N_("Encrypted, weak"),}, { "stock_lock-ok", N_("Encrypted") }, { "stock_lock-ok", N_("Encrypted, strong") }, }; @@ -591,8 +591,8 @@ efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel if (emf->valid == valid && (valid->encrypt.status != CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE || valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE)) { - char *classid; - char *iconpath; + char *classid, *iconpath; + const char *icon; CamelMimePart *iconpart; camel_stream_printf (stream, "<table border=0 width=\"100%%\" cellpadding=3 cellspacing=0%s><tr>", @@ -600,7 +600,12 @@ efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel 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); + + if (valid->sign.status != 0) + icon = smime_sign_table[valid->sign.status].icon; + else + icon = smime_encrypt_table[valid->encrypt.status].icon; + iconpath = e_icon_factory_get_icon_filename(icon, E_ICON_SIZE_DIALOG); iconpart = em_format_html_file_part((EMFormatHTML *)emf, "image/png", iconpath); if (iconpart) { (void)em_format_add_puri(emf, sizeof(EMFormatPURI), classid, iconpart, efh_write_image); |