aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/mail-display.c5
-rw-r--r--mail/mail-format.c19
3 files changed, 11 insertions, 17 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 40b9b3e42e..a5ad0b9f0f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,7 +1,11 @@
2002-08-30 Radek Doulik <rodo@ximian.com>
+ * mail-display.c (mail_display_render): don't set margins for raw
+ message view
+
* mail-format.c (mail_format_raw_message): as below
(handle_text_plain_flowed): as below
+ (mail_format_raw_message): don't use data_urls
* mail-display.c (mail_text_write): put text in iframe, so it has
margins and should not be placed in table which changes wrapping
diff --git a/mail/mail-display.c b/mail/mail-display.c
index e1c2b3a509..88f18b50d0 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -1700,7 +1700,10 @@ mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll)
"<!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 (html, stream, "<body marginwidth=0 marginheight=0>\n");
+ if (md->current_message && md->display_style == MAIL_CONFIG_DISPLAY_SOURCE)
+ mail_html_write (html, stream, "<body>\n");
+ else
+ mail_html_write (html, stream, "<body marginwidth=0 marginheight=0>\n");
flag = md->info ? camel_tag_get (&md->info->user_tags, "follow-up") : NULL;
completed = md->info ? camel_tag_get (&md->info->user_tags, "completed-on") : NULL;
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 9696af3b1d..43eac37f52 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -202,27 +202,14 @@ mail_format_raw_message (CamelMimeMessage *mime_message, MailDisplay *md,
bytes = mail_format_get_data_wrapper_text (CAMEL_DATA_WRAPPER (mime_message), md);
if (bytes) {
- GByteArray *ba;
- gchar *xed, *iframe;
- gchar *btt = "<tt>\n";
- gchar *ett = "</tt>\n";
-
g_byte_array_append (bytes, "", 1);
html_str = e_text_to_html (bytes->data, E_TEXT_TO_HTML_CONVERT_NL |
E_TEXT_TO_HTML_CONVERT_SPACES | E_TEXT_TO_HTML_ESCAPE_8BIT);
g_byte_array_free (bytes, TRUE);
-
- ba = g_byte_array_new ();
- g_byte_array_append (ba, (const guint8 *) btt, strlen (btt) + 1);
- g_byte_array_append (ba, (const guint8 *) html_str, strlen (html_str) + 1);
- g_byte_array_append (ba, (const guint8 *) ett, strlen (ett) + 1);
+ mail_html_write (html, stream, "<tt>");
+ mail_html_write (html, stream, html_str);
g_free (html_str);
-
- xed = g_strdup_printf ("x-evolution-data:%p", mime_message);
- iframe = g_strdup_printf ("<iframe src=\"%s\" frameborder=0 scrolling=no>could not get %s</iframe>", xed, xed);
- mail_display_add_url (md, "data_urls", xed, ba);
- mail_html_write (html, stream, iframe);
- g_free (iframe);
+ mail_html_write (html, stream, "</tt>");
}
}