diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/mail-display.c | 7 | ||||
| -rw-r--r-- | mail/mail-display.h | 2 | ||||
| -rw-r--r-- | mail/mail-format.c | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index d730844a94..672fb860fe 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2001-06-15 Dan Winship <danw@ximian.com> + + * mail-format.c (mail_format_mime_message): We can't output + "<html>" and "</html>" here because it gets called recursively to + display message/rfc822 subparts. + + * mail-display.c (mail_display_redisplay): Move rodo's html header + changes from mail_format_mime_message to here. + 2001-06-14 Jeffrey Stedfast <fejj@ximian.com> * folder-browser.c (got_folder): Updated to reflect changes to diff --git a/mail/mail-display.c b/mail/mail-display.c index 1025b0af7c..f0957b5234 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -1130,8 +1130,6 @@ clear_data (CamelObject *object, gpointer event_data, gpointer user_data) void mail_display_redisplay (MailDisplay *md, gboolean unscroll) { - printf("redisplaying\n"); - md->last_active = NULL; md->stream = gtk_html_begin (GTK_HTML (md->html)); if (!unscroll) { @@ -1139,7 +1137,8 @@ mail_display_redisplay (MailDisplay *md, gboolean unscroll) GTK_HTML (md->html)->engine->newPage = FALSE; } - mail_html_write (md->html, md->stream, "%s%s", HTML_HEADER, "<BODY>\n"); + mail_html_write (md->html, md->stream, "<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n<head>\n<meta name=\"generator\" content=\"Evolution Mail Component\">\n</head>\n"); + mail_html_write (md->html, md->stream, "<body marginwidth=0 marginheight=0>\n"); if (md->current_message) { MailConfigDisplayStyle style = mail_config_get_message_display_style (); @@ -1151,7 +1150,7 @@ mail_display_redisplay (MailDisplay *md, gboolean unscroll) } } - mail_html_write (md->html, md->stream, "</BODY></HTML>\n"); + mail_html_write (md->html, md->stream, "</body></html>\n"); gtk_html_end (md->html, md->stream, GTK_HTML_STREAM_OK); md->stream = NULL; } diff --git a/mail/mail-display.h b/mail/mail-display.h index 4e21e6db1c..dfad9a9276 100644 --- a/mail/mail-display.h +++ b/mail/mail-display.h @@ -53,8 +53,6 @@ void mail_display_set_message (MailDisplay *mail_display, void mail_display_load_images (MailDisplay *mail_display); -#define HTML_HEADER "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<HTML>\n<HEAD>\n<META NAME=\"GENERATOR\" CONTENT=\"Evolution Mail Component\">\n</HEAD>\n" - void mail_html_write (GtkHTML *html, GtkHTMLStream *stream, const char *format, ...); diff --git a/mail/mail-format.c b/mail/mail-format.c index a4e3f80fd8..c195579e9a 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -169,10 +169,8 @@ mail_format_mime_message (CamelMimeMessage *mime_message, MailDisplay *md) free_data_urls); } - mail_html_write (md->html, md->stream, "<html>\n<body marginwidth=0 marginheight=0>\n"); write_headers (mime_message, md); format_mime_part (CAMEL_MIME_PART (mime_message), md); - mail_html_write (md->html, md->stream, "</body>\n</html>\n"); } |