diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 555a860b6c..8b68dd5b49 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2009-02-10 Milan Crha <mcrha@redhat.com> + + * em-format-html-display.c: (efhd_format_secure): + Format signature/encryption information nicer. + 2009-02-09 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #555888 diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 49e2d1bac9..bef662452f 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -1226,14 +1226,17 @@ efhd_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Came pobj = (struct _smime_pobject *)em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(*pobj), classid, part, efhd_xpkcs7mime_button); pobj->valid = camel_cipher_validity_clone(valid); pobj->object.free = efhd_xpkcs7mime_free; - camel_stream_printf(stream, "<td valign=top><object classid=\"%s\"></object></td><td width=100%% valign=top>", classid); + camel_stream_printf(stream, "<td valign=center><object classid=\"%s\"></object></td><td width=100%% valign=center>", classid); g_free(classid); if (valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE) { - camel_stream_printf(stream, "%s<br>", _(smime_sign_table[valid->sign.status].shortdesc)); + camel_stream_printf (stream, "%s", _(smime_sign_table[valid->sign.status].shortdesc)); } if (valid->encrypt.status != CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE) { - camel_stream_printf(stream, "%s<br>", _(smime_encrypt_table[valid->encrypt.status].shortdesc)); + if (valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE) { + camel_stream_printf (stream, "<br>"); + } + camel_stream_printf (stream, "%s", _(smime_encrypt_table[valid->encrypt.status].shortdesc)); } camel_stream_printf(stream, "</td></tr></table>"); |