From baa0b9cba06188f7a8f1a2adc512fa0260b977ca Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 18 Sep 2002 19:16:54 +0000 Subject: reverted wrapping patch svn path=/trunk/; revision=18103 --- mail/ChangeLog | 13 -------- mail/mail-display.c | 25 +++------------ mail/mail-display.h | 3 -- mail/mail-format.c | 88 +++++++++++++++++++++++++---------------------------- 4 files changed, 46 insertions(+), 83 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 4cc9afca4a..7c2c4b2190 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -212,19 +212,6 @@ * component-factory.c (storage_xfer_folder): Dont translate / to dir_sep anymore, we always use /. -2002-08-30 Radek Doulik - - * 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 - behavior - 2002-08-29 Peter Williams * folder-browser-ui.c: Add HAS_FLAGS to a few miscellaneous commands diff --git a/mail/mail-display.c b/mail/mail-display.c index 4376f9b643..80e9fa93c3 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -1630,13 +1630,8 @@ mail_display_redisplay_when_loaded (MailDisplay *md, } void -mail_text_write (GtkHTML *html, GtkHTMLStream *stream, MailDisplay *md, CamelMimePart *part, gint idx, gboolean printing, const char *text) +mail_text_write (GtkHTML *html, GtkHTMLStream *stream, gboolean printing, const char *text) { - GByteArray *ba; - gchar *xed, *iframe; - gchar *btt = "\n"; - gchar *ett = "\n"; - guint flags; char *htmltext; @@ -1650,17 +1645,10 @@ mail_text_write (GtkHTML *html, GtkHTMLStream *stream, MailDisplay *md, CamelMim htmltext = e_text_to_html_full (text, flags, mail_config_get_citation_color ()); - ba = g_byte_array_new (); - g_byte_array_append (ba, (const guint8 *) btt, strlen (btt) + 1); - g_byte_array_append (ba, (const guint8 *) htmltext, strlen (htmltext) + 1); - g_byte_array_append (ba, (const guint8 *) ett, strlen (ett) + 1); + gtk_html_write (html, stream, "", 4); + gtk_html_write (html, stream, htmltext, strlen (htmltext)); + gtk_html_write (html, stream, "", 5); g_free (htmltext); - - xed = g_strdup_printf ("x-evolution-data:%p-%d", part, idx); - iframe = g_strdup_printf ("", xed, xed); - mail_display_add_url (md, "data_urls", xed, ba); - gtk_html_write (html, stream, iframe, strlen (iframe)); - g_free (iframe); } void @@ -1706,10 +1694,7 @@ mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll) "\n" "\n" "\n\n\n"); - if (md->current_message && md->display_style == MAIL_CONFIG_DISPLAY_SOURCE) - mail_html_write (html, stream, "\n"); - else - mail_html_write (html, stream, "\n"); + mail_html_write (html, stream, "\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-display.h b/mail/mail-display.h index c192d818c3..bd27001150 100644 --- a/mail/mail-display.h +++ b/mail/mail-display.h @@ -100,9 +100,6 @@ void mail_display_load_images (MailDisplay *mail_display); void mail_text_write (GtkHTML *html, GtkHTMLStream *stream, - MailDisplay *md, - CamelMimePart *part, - gint idx, gboolean printing, const char *text); void mail_error_printf (GtkHTML *html, diff --git a/mail/mail-format.c b/mail/mail-format.c index 43eac37f52..12cd41dc90 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -64,7 +64,7 @@ static char *try_inline_binhex (char *start, CamelMimePart *part, static gboolean handle_text_plain (CamelMimePart *part, const char *mime_type, MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream); -static gboolean handle_text_plain_flowed (char *text, CamelMimePart *part, +static gboolean handle_text_plain_flowed (char *text, MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream); static gboolean handle_text_enriched (CamelMimePart *part, const char *mime_type, @@ -200,17 +200,21 @@ mail_format_raw_message (CamelMimeMessage *mime_message, MailDisplay *md, TRUE, NULL, html, NULL)) return; + mail_html_write (html, stream, + "

\n"); + bytes = mail_format_get_data_wrapper_text (CAMEL_DATA_WRAPPER (mime_message), md); if (bytes) { 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); - mail_html_write (html, stream, ""); + mail_html_write (html, stream, html_str); g_free (html_str); - mail_html_write (html, stream, ""); } + + mail_html_write (html, stream, "

"); } static const char * @@ -665,8 +669,8 @@ attachment_header (CamelMimePart *part, const char *mime_type, MailDisplay *md, } mail_html_write (html, stream, "" - "" - "

\n"); + "" + "

\n"); } static gboolean @@ -1009,7 +1013,7 @@ write_headers (CamelMimeMessage *message, MailDisplay *md, stream, "" /* Top margin */ - "" + "" /* Left margin */ "" /* Black border */ @@ -1197,13 +1201,18 @@ struct { static int num_specials = (sizeof (text_specials) / sizeof (text_specials[0])); static void -write_one_text_plain_chunk (MailDisplay *md, CamelMimePart *part, gint idx, const char *text, int len, GtkHTML *html, GtkHTMLStream *stream, gboolean printing) +write_one_text_plain_chunk (const char *text, int len, GtkHTML *html, GtkHTMLStream *stream, gboolean printing) { char *buf; + mail_html_write (html, stream, + "

\n"); + buf = g_strndup (text, len); - mail_text_write (html, stream, md, part, idx, printing, buf); + mail_text_write (html, stream, printing, buf); g_free (buf); + + mail_html_write (html, stream, "

\n"); } static gboolean @@ -1217,7 +1226,7 @@ handle_text_plain (CamelMimePart *part, const char *mime_type, char *p, *start, *text; const char *format; GByteArray *bytes; - int i, idx = 0; + int i; bytes = mail_format_get_data_wrapper_text (wrapper, md); if (!bytes) @@ -1240,7 +1249,7 @@ handle_text_plain (CamelMimePart *part, const char *mime_type, type = camel_mime_part_get_content_type (part); format = header_content_type_param (type, "format"); if (format && !g_strcasecmp (format, "flowed")) - return handle_text_plain_flowed (text, part, md, html, stream); + return handle_text_plain_flowed (text, md, html, stream); /* Only look for binhex and stuff if this is real text/plain. * (and not, say, application/mac-binhex40 that mail-identify @@ -1262,7 +1271,7 @@ handle_text_plain (CamelMimePart *part, const char *mime_type, /* Deal with special case */ if (start != p) - write_one_text_plain_chunk (md, part, idx ++, p, start - p, html, stream, md->printing); + write_one_text_plain_chunk (p, start - p, html, stream, md->printing); p = text_specials[i].handler (start, part, start - text, md, html, stream); if (p == start) { @@ -1276,13 +1285,13 @@ handle_text_plain (CamelMimePart *part, const char *mime_type, break; } p++; - write_one_text_plain_chunk (md, part, idx ++, start, p - start, html, stream, md->printing); + write_one_text_plain_chunk (start, p - start, html, stream, md->printing); } else if (p) write_hr (html, stream); } /* Finish up (or do the whole thing if there were no specials). */ if (p) - write_one_text_plain_chunk (md, part, idx ++, p, strlen (p), html, stream, md->printing); + write_one_text_plain_chunk (p, strlen (p), html, stream, md->printing); g_free (text); @@ -1290,16 +1299,15 @@ handle_text_plain (CamelMimePart *part, const char *mime_type, } static gboolean -handle_text_plain_flowed (char *buf, CamelMimePart *part, MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream) +handle_text_plain_flowed (char *buf, MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream) { char *text, *line, *eol, *p; int prevquoting = 0, quoting, len, br_pending = 0; guint32 citation_color = mail_config_get_citation_color (); - GByteArray *ba; - gchar *iframe, *xed; - - ba = g_byte_array_new (); - g_byte_array_append (ba, "\n\n\n", 34); + + mail_html_write (html, stream, + "\n\n" + "\n\n"); for (line = buf; *line; line = eol + 1) { /* Process next line */ @@ -1313,30 +1321,22 @@ handle_text_plain_flowed (char *buf, CamelMimePart *part, MailDisplay *md, GtkHT if (quoting != prevquoting) { if (prevquoting == 0) { if (md->printing) - g_byte_array_append (ba, "", 3); - else { - gchar num [7]; - g_byte_array_append (ba, "", 2); - } + mail_html_write (html, stream, ""); + else + gtk_html_stream_printf (stream, "", citation_color); if (br_pending) br_pending--; } while (quoting > prevquoting) { - g_byte_array_append (ba, "", 24); + mail_html_write (html, stream, ""); prevquoting++; } while (quoting < prevquoting) { - g_byte_array_append (ba, "", 13); + mail_html_write (html, stream, ""); prevquoting--; } if (quoting == 0) { - if (md->printing) - g_byte_array_append (ba, "", 4); - else - g_byte_array_append (ba, "\n", 8); + mail_html_write (html, stream, md->printing ? "" : "\n"); if (br_pending) br_pending--; } @@ -1353,7 +1353,7 @@ handle_text_plain_flowed (char *buf, CamelMimePart *part, MailDisplay *md, GtkHT } while (br_pending) { - g_byte_array_append (ba, " \n", 5); + mail_html_write (html, stream, " \n"); br_pending--; } @@ -1363,7 +1363,7 @@ handle_text_plain_flowed (char *buf, CamelMimePart *part, MailDisplay *md, GtkHT E_TEXT_TO_HTML_CONVERT_SPACES : E_TEXT_TO_HTML_CONVERT_SPACES | E_TEXT_TO_HTML_CONVERT_URLS); if (text && *text) - g_byte_array_append (ba, text, strlen (text)); + mail_html_write (html, stream, text); g_free (text); if ((len > 0 && p[len - 1]) != ' ' || !strcmp (p, "-- ")) @@ -1375,13 +1375,7 @@ handle_text_plain_flowed (char *buf, CamelMimePart *part, MailDisplay *md, GtkHT g_free (buf); - g_byte_array_append (ba, "\n", 6); - - xed = g_strdup_printf ("x-evolution-data:%p", part); - iframe = g_strdup_printf ("could not get %s", 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, "\n\n"); return TRUE; } @@ -1673,7 +1667,7 @@ handle_text_enriched (CamelMimePart *part, const char *mime_type, g_string_free (string, TRUE); xed = g_strdup_printf ("x-evolution-data:%p", part); - gtk_html_stream_printf (stream, "could not get %s", xed, xed); + gtk_html_stream_printf (stream, "", xed); mail_display_add_url (md, "data_urls", xed, ba); return TRUE; @@ -1707,7 +1701,7 @@ handle_text_html (CamelMimePart *part, const char *mime_type, location = get_location (part, md); if (!location) location = get_cid (part, md); - gtk_html_stream_printf (stream, "could not get %s", location, location); + gtk_html_stream_printf (stream, "", location); return TRUE; } @@ -1841,8 +1835,8 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type, "Click the lock icon for more information.")); mail_html_write (html, stream, - "" - "\n"); + "" + "\n"); } else { CamelCipherValidity *valid = NULL; CamelException ex; @@ -1887,7 +1881,7 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type, if (message) { gtk_html_stream_printf (stream, "", good || md->printing ? "" : "color=red"); - mail_text_write (html, stream, md, part, 0, md->printing, message); + mail_text_write (html, stream, md->printing, message); mail_html_write (html, stream, ""); } -- cgit v1.2.3