gtkhtml r8632 - branches/gnome-2-20/src

[mbarnes svn gnome org]

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

Modified:
   branches/gnome-2-20/src/ChangeLog
   branches/gnome-2-20/src/htmltext.c
Log:
2007-11-22  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #495073

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

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