Get rid of obsolete requirement for "--without-bonobo" for the gtkhtml

	* HACKING: Get rid of obsolete requirement for "--without-bonobo"
	for the gtkhtml module. The internal modules list at Eazel was
	updated but someone forgot to update HACKING, as usual.

	* components/services/trilobite/sample/command-line/.cvsignore:
	* components/services/trilobite/sample/nautilus-view/.cvsignore:
	* components/services/trilobite/sample/nautilus-view/icons/.cvsignore:
	* components/services/trilobite/sample/service/.cvsignore:
	Lots of generated files that need to be ignored for CVS happiness.

	* libnautilus-extensions/nautilus-file.c: (rename_callback):
	Fixed bug in handling error cases. I couldn't test this until Pavel
	fixed the GNOME VFS bug that prevented any errors from being
	reported, but he did and I am ready.

	* libnautilus-extensions/nautilus-icon-canvas-item.c:
	(draw_or_measure_label_text): Fixed a bug where you'd have a big
	black box behind the text you are renaming by checking for rename
	mode before drawing the black background.

	* src/file-manager/fm-icon-view.c:
	(set_sort_criterion), (get_sort_criterion_by_metadata_text),
	(get_sort_criterion_by_menu_path), (fm_icon_view_begin_loading),
	(sort_callback): Add code to save and load the "sort by" setting.

1 files changed, 1 insertions, 1 deletions

diff --git a/HACKING b/HACKING
index 3c2d89871..2b1f7d319 100644
--- a/HACKING
+++ b/HACKING
@@ -27,7 +27,7 @@ gdk-pixbuf:	   HEAD               --enable-canvas-pixbuf
 gnome-print:	   HEAD
 bonobo:		   HEAD               --enable-oaf=yes
 gnome-vfs:	   HEAD               --enable-oaf=yes
-gtkhtml:	   HEAD               --without-bonobo
+gtkhtml:	   HEAD
 eog:               HEAD               --enable-oaf=yes
 gnet:              HEAD