[evolution-patches] gtkhtml : the return of the dashes

[Frederic Crozat <fcrozat mandrakesoft com>]

Hi all, 

it seems my previous fix for bug #38589 was incomplete, there was two
other bugs in generated html, which could be found when using multiple
'-' in a signature..

The attach patch fixes it (for both 1.4 and HEAD)
-- 
Frederic Crozat <fcrozat mandrakesoft com>
Mandrakesoft

? gtkhtml-dashes2.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.1814.2.14
diff -u -r1.1814.2.14 ChangeLog
--- ChangeLog	13 Oct 2003 08:49:46 -0000	1.1814.2.14
+++ ChangeLog	14 Oct 2003 15:54:00 -0000
@@ -1,3 +1,8 @@
+2003-10-14  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* htmlobject.c: (handle_object_data):
+	Close comment when saving object data, part 2 (bug #38589)
+
 2003-10-13  Frederic Crozat  <fcrozat mandrakesoft com>
 
 	* htmlobject.c: (object_save_data):
Index: htmlobject.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlobject.c,v
retrieving revision 1.160.6.3
diff -u -r1.160.6.3 htmlobject.c
--- htmlobject.c	13 Oct 2003 08:49:47 -0000	1.160.6.3
+++ htmlobject.c	14 Oct 2003 15:54:00 -0000
@@ -1664,12 +1664,12 @@
 	/* printf ("handle: %s %s %s %s\n", state->save_data_class_name, key, value, str); */
 	if (!str) {
 		/* printf ("clear\n"); */
-		html_engine_save_output_string (state, "<!--+GtkHTML:<DATA class=\"%s\" clear=\"%s\">",
+		html_engine_save_output_string (state, "<!--+GtkHTML:<DATA class=\"%s\" clear=\"%s\">-->",
 						state->save_data_class_name, key);
 		state->data_to_remove = g_slist_prepend (state->data_to_remove, key);
 	} else if (strcmp (value, str)) {
 		/* printf ("change\n"); */
-		html_engine_save_output_string (state, "<!--+GtkHTML:<DATA class=\"%s\" key=\"%s\" value=\"%s\">",
+		html_engine_save_output_string (state, "<!--+GtkHTML:<DATA class=\"%s\" key=\"%s\" value=\"%s\">-->",
 						state->save_data_class_name, key, str);
 		html_engine_set_class_data (state->engine, state->save_data_class_name, key, value);
 	}