[pyatspi2] Tests: use libatspi's dbus-gmain implementation

[Mike Gorse <mgorse src gnome org>]

commit 5b61c5b607ece88e5a69da9dda53bf1d281d37f0
Author: Mike Gorse <mgorse suse com>
Date:   Sat Apr 11 16:08:53 2020 -0500

    Tests: use libatspi's dbus-gmain implementation
    
    Removes the dependency on the deprecated dbus-glib.
    
    Fixes https://gitlab.gnome.org/GNOME/pyatspi2/issues/4

 configure.ac                  | 6 +++---
 tests/apps/Makefile.am        | 6 ++++--
 tests/apps/test-application.c | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f8e6b5b..78fc525 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,9 +66,9 @@ if test "$enable_tests" = "yes"; then
         AC_SUBST(GLIB_LIBS)
         AC_SUBST(GLIB_CFLAGS)
 
-        PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.7.0])
-        AC_SUBST(DBUS_GLIB_LIBS)
-        AC_SUBST(DBUS_GLIB_CFLAGS)
+        PKG_CHECK_MODULES(AT_SPI, [atspi-2])
+        AC_SUBST(AT_SPI_LIBS)
+        AC_SUBST(AT_SPI_CFLAGS)
 
         PKG_CHECK_MODULES(GOBJ, [gobject-2.0 >= 2.0.0])
         AC_SUBST(GOBJ_LIBS)
diff --git a/tests/apps/Makefile.am b/tests/apps/Makefile.am
index 12a3257..dbde2d2 100644
--- a/tests/apps/Makefile.am
+++ b/tests/apps/Makefile.am
@@ -5,12 +5,14 @@ check_LTLIBRARIES = libnoopapp.la \
                    libactionapp.la \
                    librelationapp.la
 
-test_application_CFLAGS = $(DBUS_GLIB_CFLAGS)  \
+test_application_CFLAGS = $(AT_SPI_CFLAGS)     \
                          $(ATK_CFLAGS)         \
+                         $(GOBJ_CFLAGS)        \
                          $(GMODULE_CFLAGS)     \
                          -I$(top_srcdir)
 
-test_application_LDADD = $(DBUS_GLIB_LIBS)     \
+test_application_LDADD = $(AT_SPI_LIBS)        \
+                        $(GOBJ_LIBS)   \
                         $(GMODULE_LIBS)        \
                         $(ATK_LIBS)
 
diff --git a/tests/apps/test-application.c b/tests/apps/test-application.c
index f6cd231..c8b2b06 100644
--- a/tests/apps/test-application.c
+++ b/tests/apps/test-application.c
@@ -35,6 +35,7 @@
 #include <gmodule.h>
 #include <atk/atk.h>
 #include <dbus/dbus.h>
+#include <atspi/atspi-gmain.h>
 
 /* The test module, GModule containing interface for an atk-test */
 static GModule *test_module;
@@ -222,7 +223,7 @@ init_dbus_interface(gchar *bus_name)
                                                &test_vtable,
                                                NULL));
 
-  dbus_connection_setup_with_g_main(dbus_bus, g_main_context_default());
+  atspi_dbus_connection_setup_with_g_main(dbus_bus, g_main_context_default());
 }
 
 static void