diff options
| author | michael <michael@e2bd861d-eb25-0410-b326-f6ed22b6b98c> | 2001-12-07 16:43:33 +0000 |
|---|---|---|
| committer | michael <michael@e2bd861d-eb25-0410-b326-f6ed22b6b98c> | 2001-12-07 16:43:33 +0000 |
| commit | fd46827d0ef868929e7c255334b73adf2e305a85 (patch) | |
| tree | d8834e2c5d14e61390f5c54e4bef3f91b55c504b /registryd/deviceeventcontroller.h | |
| parent | 24c8606559b9f19e429ec7429dec793ddad1357c (diff) | |
| download | at-spi2-core-fd46827d0ef868929e7c255334b73adf2e305a85.tar.gz | |
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
Diffstat (limited to 'registryd/deviceeventcontroller.h')
| -rw-r--r-- | registryd/deviceeventcontroller.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h index e3e8c971..8b9ba60d 100644 --- a/registryd/deviceeventcontroller.h +++ b/registryd/deviceeventcontroller.h @@ -33,8 +33,8 @@ G_BEGIN_DECLS #define SPI_DEVICE_EVENT_CONTROLLER_TYPE (spi_device_event_controller_get_type ()) #define SPI_DEVICE_EVENT_CONTROLLER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDeviceEventController)) #define SPI_DEVICE_EVENT_CONTROLLER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDeviceEventControllerClass)) -#define IS_SPI_DEVICE_EVENT_CONTROLLER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SPI_DEVICE_EVENT_CONTROLLER_TYPE)) -#define IS_SPI_DEVICE_EVENT_CONTROLLER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_DEVICE_EVENT_CONTROLLER_TYPE)) +#define SPI_IS_DEVICE_EVENT_CONTROLLER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SPI_DEVICE_EVENT_CONTROLLER_TYPE)) +#define SPI_IS_DEVICE_EVENT_CONTROLLER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_DEVICE_EVENT_CONTROLLER_TYPE)) #define SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDeviceEventControllerClass)) typedef struct { @@ -51,8 +51,9 @@ typedef struct { gboolean (*check_key_event) (SpiDeviceEventController *controller); } SpiDeviceEventControllerClass; -GType spi_device_event_controller_get_type (void); -SpiDeviceEventController *spi_device_event_controller_new (void *registry); +GType spi_device_event_controller_get_type (void); +SpiDeviceEventController *spi_device_event_controller_new (void *registry); +gboolean spi_device_event_controller_check_key_event (SpiDeviceEventController *controller); G_END_DECLS |