diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-07-03 19:42:48 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-07-03 19:46:06 +0200 |
| commit | 79e6331c743db0365112c10ca49133b2d1a8480f (patch) | |
| tree | 507178ebf12357e0c6ea9988cc37fe082e80a80f | |
| parent | 2a1266923244199938dd703eb08704d98edb1300 (diff) | |
| download | at-spi2-core-79e6331c743db0365112c10ca49133b2d1a8480f.tar.gz | |
Fix a couple of introspection issues
This mainly restores the gir entry for AtspiApplication.
https://bugzilla.gnome.org/show_bug.cgi?id=784481
| -rw-r--r-- | atspi/Makefile.am | 5 | ||||
| -rw-r--r-- | atspi/atspi-application.h | 1 | ||||
| -rw-r--r-- | atspi/atspi-device-listener.c | 4 | ||||
| -rw-r--r-- | atspi/atspi-event-listener.c | 12 |
4 files changed, 15 insertions, 7 deletions
diff --git a/atspi/Makefile.am b/atspi/Makefile.am index 98b0f048..636cc76c 100644 --- a/atspi/Makefile.am +++ b/atspi/Makefile.am @@ -137,12 +137,11 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) if HAVE_INTROSPECTION Atspi-2.0.gir: libatspi.la -Atspi_2_0_gir_INCLUDES = GLib-2.0 GObject-2.0 -Atspi_2_0_gir_PACKAGES = dbus-1 +Atspi_2_0_gir_INCLUDES = DBus-1.0 GLib-2.0 GObject-2.0 Atspi_2_0_gir_EXPORT_PACKAGES = atspi-2 Atspi_2_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) Atspi_2_0_gir_LIBS = libatspi.la $(top_builddir)/dbind/libdbind.la -Atspi_2_0_gir_FILES = $(libatspi_la_SOURCES) $(atspi_headers) +Atspi_2_0_gir_FILES = $(libatspi_la_SOURCES) $(atspi_headers) atspi-enum-types.c atspi-enum-types.h Atspi_2_0_gir_SCANNERFLAGS = --namespace Atspi --nsversion=2.0 INTROSPECTION_SCANNER_ARGS += --c-include='atspi/atspi.h' INTROSPECTION_GIRS += Atspi-2.0.gir diff --git a/atspi/atspi-application.h b/atspi/atspi-application.h index a2cc2e43..a3826d51 100644 --- a/atspi/atspi-application.h +++ b/atspi/atspi-application.h @@ -27,6 +27,7 @@ #include <dbus/dbus.h> +#include "atspi-types.h" #include "atspi-accessible.h" #include <sys/time.h> diff --git a/atspi/atspi-device-listener.c b/atspi/atspi-device-listener.c index 3ac44512..5aac60a7 100644 --- a/atspi/atspi-device-listener.c +++ b/atspi/atspi-device-listener.c @@ -261,8 +261,6 @@ atspi_device_listener_new_simple (AtspiDeviceListenerSimpleCB callback, * * Adds an in-process callback function to an existing #AtspiDeviceListener. * - * Returns: #TRUE if successful, otherwise #FALSE. - * **/ void atspi_device_listener_add_callback (AtspiDeviceListener *listener, @@ -287,8 +285,6 @@ atspi_device_listener_add_callback (AtspiDeviceListener *listener, * Removes an in-process callback function from an existing * #AtspiDeviceListener. * - * Returns: #TRUE if successful, otherwise #FALSE. - * **/ void atspi_device_listener_remove_callback (AtspiDeviceListener *listener, diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c index 718c0d22..752547d5 100644 --- a/atspi/atspi-event-listener.c +++ b/atspi/atspi-event-listener.c @@ -622,6 +622,18 @@ copy_event_properties (GArray *src) return dst; } +/** + * atspi_event_listener_register_from_callback_full: + * @callback: (scope async): an #AtspiEventListenerCB function pointer. + * @user_data: (closure callback) + * @callback_destroyed: (destroy callback) + * @event_type: + * @properties: (element-type utf8) + * @error: + * + * Returns: #TRUE if successful, otherwise #FALSE. + * + **/ gboolean atspi_event_listener_register_from_callback_full (AtspiEventListenerCB callback, void *user_data, |