2001-12-07 Michael Meeks <michael@ximian.com>

2001-12-07  Michael Meeks  <michael@ximian.com>

	* libspi/component.c
	(impl_accessibility_component_get_extents): make it match
	it's sig.

	* libspi/registry.c (_registry_notify_listeners):
	re-remove X headers & reconcile conflicts.
	(spi_listener_struct_free): bad conflict resolve.
	(impl_accessibility_registry_register_application):
	more bad merging fixed.
	(impl_accessibility_registry_deregister_application): ditto.
	(spi_registry_new): ditto.
	(spi_registry_init): don't have an applications field.

[ merge fixups2 branch to here ]

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@146 e2bd861d-eb25-0410-b326-f6ed22b6b98c