diff options
author | Mike Gorse <mgorse@suse.com> | 2013-05-10 18:56:32 -0500 |
---|---|---|
committer | Mike Gorse <mgorse@suse.com> | 2013-05-10 18:56:32 -0500 |
commit | e74c40ea4b7616930557ca2e9eda73f5b344a4b5 (patch) | |
tree | 85d65785426bede318aa66e7804f4a6fcb24d30d /atspi/atspi-registry.c | |
parent | a29788df335d9ffc2fd471463ba996ba1aca4665 (diff) | |
parent | 7afb51e5093fef46c699d92ee8eee94f5b6886fb (diff) | |
download | at-spi2-core-e74c40ea4b7616930557ca2e9eda73f5b344a4b5.tar.gz |
Merge branch 'enum-types'
Conflicts:
atspi/Makefile.am
atspi/atspi-accessible.c
Diffstat (limited to 'atspi/atspi-registry.c')
-rw-r--r-- | atspi/atspi-registry.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/atspi/atspi-registry.c b/atspi/atspi-registry.c index 116da196..fa876600 100644 --- a/atspi/atspi-registry.c +++ b/atspi/atspi-registry.c @@ -197,7 +197,8 @@ atspi_register_keystroke_listener (AtspiDeviceListener *listener, GArray *key_set, AtspiKeyMaskType modmask, AtspiKeyEventMask event_types, - gint sync_type, GError **error) + AtspiKeyListenerSyncType sync_type, + GError **error) { DeviceListenerEntry *e; |