Fix a couple of introspection issues

This mainly restores the gir entry for AtspiApplication.

https://bugzilla.gnome.org/show_bug.cgi?id=784481

diff --git a/atspi/Makefile.am b/atspi/Makefile.am
index 98b0f04..636cc76 100644 (file)
--- 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 a2cc2e4..a3826d5 100644 (file)
--- 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 3ac4451..5aac60a 100644 (file)
--- 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 718c0d2..752547d 100644 (file)
--- 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,