diff options
author | Jacob Brown <jeblinux@gmail.com> | 2008-06-02 14:01:57 +0800 |
---|---|---|
committer | Bharath Acharya <abharath@src.gnome.org> | 2008-06-02 14:01:57 +0800 |
commit | a1592d02b04e16f74f0ecad2164cc188280b8c92 (patch) | |
tree | da89179bc544cd149afb3ddc68bff7d9bc5d2b99 /mail | |
parent | b6442f0191d55e6325e0a111e3513056114fea44 (diff) | |
download | gsoc2013-evolution-a1592d02b04e16f74f0ecad2164cc188280b8c92.tar.gz gsoc2013-evolution-a1592d02b04e16f74f0ecad2164cc188280b8c92.tar.zst gsoc2013-evolution-a1592d02b04e16f74f0ecad2164cc188280b8c92.zip |
Committing on behalf of Jacob Brown <jeblinux@gmail.com>
2008-06-02 Jacob Brown <jeblinux@gmail.com>
** Fix for bug #529464
svn path=/trunk/; revision=35575
Diffstat (limited to 'mail')
-rw-r--r-- | mail/ChangeLog | 6 | ||||
-rw-r--r-- | mail/em-format-html-display.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 0fea6f5750..ded70d8136 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2008-06-02 Jacob Brown <jeblinux@gmail.com> + + ** Fix for bug #529464 + + * em-format-html-display.c: (efhd_format_optional): Do not use "handle" + 2008-06-02 Milan Crha <mcrha@redhat.com> ** Fix for bug #535749 diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 6738990a0d..bd8bcc6c2d 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -2486,7 +2486,7 @@ efhd_format_optional(EMFormat *emf, CamelStream *fstream, CamelMimePart *part, C EM_FORMAT_HTML_VPAD "<table cellspacing=0 cellpadding=0><tr><td><h3><font size=-1 color=red>"); - html = camel_text_to_html(_("Evolution cannot render this email as it is too large to handle. You can view it unformatted or with an external text editor."), ((EMFormatHTML *)emf)->text_html_flags & CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0); + html = camel_text_to_html(_("Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."), ((EMFormatHTML *)emf)->text_html_flags & CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0); camel_stream_write_string(stream, html); camel_stream_write_string(stream, "</font></h3></td></tr></table>\n"); |