diff options
author | Radek Doulik <rodo@src.gnome.org> | 2002-09-19 03:16:54 +0800 |
---|---|---|
committer | Radek Doulik <rodo@src.gnome.org> | 2002-09-19 03:16:54 +0800 |
commit | baa0b9cba06188f7a8f1a2adc512fa0260b977ca (patch) | |
tree | 95ca81ecb5d0791effd85f97a165f474b1b12792 /mail/mail-display.c | |
parent | f4daf52f3a4ff6020a9f22e73e164cbf312a52b3 (diff) | |
download | gsoc2013-evolution-baa0b9cba06188f7a8f1a2adc512fa0260b977ca.tar.gz gsoc2013-evolution-baa0b9cba06188f7a8f1a2adc512fa0260b977ca.tar.zst gsoc2013-evolution-baa0b9cba06188f7a8f1a2adc512fa0260b977ca.zip |
reverted wrapping patch
svn path=/trunk/; revision=18103
Diffstat (limited to 'mail/mail-display.c')
-rw-r--r-- | mail/mail-display.c | 25 |
1 files changed, 5 insertions, 20 deletions
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 = "<tt>\n"; - gchar *ett = "</tt>\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, "<tt>", 4); + gtk_html_write (html, stream, htmltext, strlen (htmltext)); + gtk_html_write (html, stream, "</tt>", 5); g_free (htmltext); - - xed = g_strdup_printf ("x-evolution-data:%p-%d", part, idx); - 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); - 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) "<!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"); - 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"); + 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; |