gtkhtml r8631 - trunk/gtkhtml

[mbarnes svn gnome org]

Author: mbarnes
Date: 2007-11-22 14:56:12 +0000 (Thu, 22 Nov 2007)
New Revision: 8631
ViewCVS link: http://svn.gnome.org/viewcvs/gtkhtml?rev=8631&view=rev

Modified:
   trunk/gtkhtml/ChangeLog
   trunk/gtkhtml/htmltext.c
Log:
2007-11-22  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #495073

	* gtkhtml/htmltext.c (merge_spell_errors):
	New function consumes two sorted lists of SpellErrors and returns a
	single sorted list of SpellErrors with no duplicates.

	* gtkhtml/htmltext.c (object_merge), (html_text_spell_errors_add):
	Call merge_spell_errors() instead of g_list_insert_sorted() or
	g_list_concat().