* components/hardware/main.c: (main):
	* components/image-viewer/nautilus-image-view.c:
	(init_server_factory):
	* components/loser/content/main.c: (main):
	* components/loser/sidebar/main.c: (main):
	* components/throbber/main.c: (main):
	* libnautilus/nautilus-view-standard-main.c:
	(nautilus_view_standard_main_multi),
	(nautilus_view_create_from_get_type_function):
	* src/nautilus-main.c: (main):
	Remove unneeded code and restore display-specific registration.
	This gets rid of a bunch of GNOME2_CONVERSION_COMPLETE ifdefs.

	* libnautilus-private/nautilus-directory-metafile-monitor.h:
	* libnautilus-private/nautilus-metafile-factory.c:
	* libnautilus-private/nautilus-metafile-factory.h:
	* libnautilus-private/nautilus-metafile.h:
	These had emacs mode lines that said they were IDL files.

	* libnautilus-private/nautilus-directory-metafile-monitor.c:
	* libnautilus-private/nautilus-metafile-factory.c:
	* libnautilus-private/nauti...