[evolution-patches] gtkhtml patch for #56867

[Suresh Chandrasekharan <Suresh Chandrasekharan Eng Sun COM>]

Hi All,
	Pl. check the following patch which fixes a crash in Evolution.
	
Thanks & Regards,
Suresh

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.1959
diff -u -r1.1959 ChangeLog
--- ChangeLog	9 Apr 2004 17:21:24 -0000	1.1959
+++ ChangeLog	12 Apr 2004 18:17:10 -0000
@@ -1,3 +1,10 @@
+2004-04-12  Suresh Chandrasekharan <suresh chandrasekharan sun com>
+
+	#56867 Dnd a UTF-8 url to mail compose and Evolution bombs
+
+	* htmltext.c (text_len): text_len should return the # of utf8
+        chars in *str always as opposed to # of bytes if the len is not -1.
+
 2004-03-26  Larry Ewing  <lewing ximian com>
 
 	* htmlengine.c: replace all parse_color calls with
Index: htmltext.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltext.c,v
retrieving revision 1.237
diff -u -r1.237 htmltext.c
--- htmltext.c	5 Apr 2004 19:01:18 -0000	1.237
+++ htmltext.c	12 Apr 2004 18:17:10 -0000
@@ -2300,7 +2300,7 @@
 text_len (const gchar **str, gint len)
 {
 	if (g_utf8_validate (*str, -1, NULL))
-		return len != -1 ? len : g_utf8_strlen (*str, -1);
+		return g_utf8_strlen (*str, len);
 	else {
 		*str = "[?]";
 		return 3;