aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-07-15 05:13:47 +0800
committerDan Winship <danw@src.gnome.org>2000-07-15 05:13:47 +0800
commit6746c025d5cdb4cd8f49b7bc3e339aa956b3d7c9 (patch)
tree8c9ead56f7dd6a391292aef0a00a08fd0942f693
parent057b88f12e58b1a5a969b6ac7af592b1a93e5dcc (diff)
downloadgsoc2013-evolution-6746c025d5cdb4cd8f49b7bc3e339aa956b3d7c9.tar
gsoc2013-evolution-6746c025d5cdb4cd8f49b7bc3e339aa956b3d7c9.tar.gz
gsoc2013-evolution-6746c025d5cdb4cd8f49b7bc3e339aa956b3d7c9.tar.bz2
gsoc2013-evolution-6746c025d5cdb4cd8f49b7bc3e339aa956b3d7c9.tar.lz
gsoc2013-evolution-6746c025d5cdb4cd8f49b7bc3e339aa956b3d7c9.tar.xz
gsoc2013-evolution-6746c025d5cdb4cd8f49b7bc3e339aa956b3d7c9.tar.zst
gsoc2013-evolution-6746c025d5cdb4cd8f49b7bc3e339aa956b3d7c9.zip
put a <p> at the end of the header table. (I think there used to be
* mail-format.c (write_headers): put a <p> at the end of the header table. (I think there used to be whitespace after it, but then some gtkhtml change got rid of it...) (handle_text_plain): Don't do this <PRE>. Instead, CONVERT_NL and CONVERT_SPACES and wrap it in <TT>. Now if the sender didn't include any newlines, it will be wrapped to the width of the window instead of extending off into infinity. svn path=/trunk/; revision=4168
-rw-r--r--mail/ChangeLog10
-rw-r--r--mail/mail-format.c11
2 files changed, 17 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 2a1566da89..5552d4ad47 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,13 @@
+2000-07-14 Dan Winship <danw@helixcode.com>
+
+ * mail-format.c (write_headers): put a <p> at the end of the
+ header table. (I think there used to be whitespace after it, but
+ then some gtkhtml change got rid of it...)
+ (handle_text_plain): Don't do this <PRE>. Instead, CONVERT_NL and
+ CONVERT_SPACES and wrap it in <TT>. Now if the sender didn't
+ include any newlines, it will be wrapped to the width of the
+ window instead of extending off into infinity.
+
2000-07-13 Dan Winship <danw@helixcode.com>
* message-list.c (message_list_destroy): Only unref the folder if
diff --git a/mail/mail-format.c b/mail/mail-format.c
index a161a000bb..93049a7aa0 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -420,7 +420,7 @@ write_headers (CamelMimeMessage *message, struct mail_format_data *mfd)
camel_mime_message_get_subject (message),
TRUE, mfd->html, mfd->stream);
- mail_html_write (mfd->html, mfd->stream, "</table></td></tr></table></center>");
+ mail_html_write (mfd->html, mfd->stream, "</table></td></tr></table></center><p>");
}
@@ -480,14 +480,17 @@ handle_text_plain (CamelMimePart *part, const char *mime_type,
return handle_text_plain_flowed (text, mfd);
mail_html_write (mfd->html, mfd->stream,
- "\n<!-- text/plain -->\n<pre>\n");
+ "\n<!-- text/plain -->\n<tt>\n");
- htmltext = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_URLS);
+ htmltext = e_text_to_html (text,
+ E_TEXT_TO_HTML_CONVERT_URLS |
+ E_TEXT_TO_HTML_CONVERT_NL |
+ E_TEXT_TO_HTML_CONVERT_SPACES);
g_free (text);
mail_html_write (mfd->html, mfd->stream, "%s", htmltext);
g_free (htmltext);
- mail_html_write (mfd->html, mfd->stream, "</pre>\n");
+ mail_html_write (mfd->html, mfd->stream, "</tt>\n");
return TRUE;
}