From c886f7d8bc6d688c8a98385c1ed8b134a276f44f Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@ximian.com>
Date: Tue, 16 Oct 2001 01:59:34 +0000
Subject: don't write strings longer than they actually are.

2001-10-15  Larry Ewing  <lewing@ximian.com>

	* mail-display.c (mail_error_write): don't write strings longer
	than they actually are.

svn path=/trunk/; revision=13693
---
 mail/ChangeLog      |  5 +++++
 mail/mail-display.c | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index b71ece8f04..0700991a68 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-15  Larry Ewing  <lewing@ximian.com>
+
+	* mail-display.c (mail_error_write): don't write strings longer
+	than they actually are.
+
 2001-10-15  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* folder-browser.c (folder_browser_destroy): Remove the mark_seen
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 71a1ccbaf6..f6fc6d7080 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -37,6 +37,7 @@
 #include <gtkhtml/htmlobject.h> /* XXX */
 #include <gtkhtml/htmltext.h> /* XXX */
 #include <gtkhtml/htmlinterval.h> /* XXX */
+#include <gtkhtml/gtkhtml-stream.h>
 
 #include "e-util/e-html-utils.h"
 #include "e-util/e-mktemp.h"
@@ -1322,11 +1323,13 @@ mail_error_write (GtkHTML *html, GtkHTMLStream *stream,
 	va_end (ap);
 
 	htmltext = e_text_to_html (buf, E_TEXT_TO_HTML_CONVERT_NL | E_TEXT_TO_HTML_CONVERT_URLS);
-	gtk_html_write (html, stream, "<blockquote><em><font color=red>", 32);
-	gtk_html_write (html, stream, htmltext, strlen (htmltext));
-	gtk_html_write (html, stream, "</font></em></blockquote>", 29);
-	g_free (htmltext);
 	g_free (buf);
+
+	gtk_html_stream_printf (stream, "<blockquote><em><font color=red>");
+	gtk_html_stream_write (stream, htmltext, strlen (htmltext));
+	gtk_html_stream_printf (stream, "</font></em></blockquote>");
+
+	g_free (htmltext);
 }
 
 static void
-- 
cgit v1.2.3