diff options
| author | Mike Gorse <mgorse@novell.com> | 2011-03-21 11:48:21 -0700 |
|---|---|---|
| committer | Mike Gorse <mgorse@novell.com> | 2011-03-21 11:53:03 -0700 |
| commit | ff4004bdb88bd2a6c4edfb2858188a9880dabb92 (patch) | |
| tree | eb947627ec2e7f341de2106a89567e3ecba84c0c /droute | |
| parent | 10144fcf6ea817879043e0994502a65a102289fd (diff) | |
| download | at-spi2-atk-ff4004bdb88bd2a6c4edfb2858188a9880dabb92.tar.gz | |
Use libatspi to get the accessibility bus and handle main loop integration
Remove function to get the accessibility bus, since it was duplicating code
in at-spi2-core and should be modified for BGO#644851.
Also, use atspi_dbus_*_setup_with_g_main instead of depending on dbus-glib,
so that FDO#35115 doesn't show up and we don't need to disable p2p if an old
version of dbus-glib is installed.
Note that at-spi2-atk now depends on libatspi where previously it did not.
Diffstat (limited to 'droute')
| -rw-r--r-- | droute/Makefile.am | 10 | ||||
| -rw-r--r-- | droute/droute-test.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/droute/Makefile.am b/droute/Makefile.am index 39d6645..38e6b09 100644 --- a/droute/Makefile.am +++ b/droute/Makefile.am @@ -1,6 +1,7 @@ noinst_LTLIBRARIES = libdroute.la -libdroute_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \ +libdroute_la_CFLAGS = $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(top_builddir)\ -I$(top_srcdir) \ -Werror=implicit-function-declaration @@ -12,16 +13,17 @@ libdroute_la_SOURCES =\ droute-variant.h\ droute-pairhash.c\ droute-pairhash.h -libdroute_la_LIBADD = $(DBUS_GLIB_LIBS) +libdroute_la_LIBADD = $(DBUS_LIBS) TESTS = droute-test check_PROGRAMS = droute-test droute_test_SOURCES = droute-test.c -droute_test_CFLAGS = $(DBUS_GLIB_CFLAGS) \ +droute_test_CFLAGS = $(DBUS_CFLAGS) \ -I$(top_builddir)\ -I$(top_srcdir) droute_test_LDFLAGS = $(top_builddir)/dbind/libdbind.la\ libdroute.la\ - $(DBUS_GLIB_LIBS) + $(DBUS_LIBS) \ + $(ATSPI_LIBS) diff --git a/droute/droute-test.c b/droute/droute-test.c index 33766a2..8701517 100644 --- a/droute/droute-test.c +++ b/droute/droute-test.c @@ -249,7 +249,7 @@ int main (int argc, char **argv) dbus_error_init (&error); main_loop = g_main_loop_new(NULL, FALSE); bus = dbus_bus_get (DBUS_BUS_SESSION, &error); - dbus_connection_setup_with_g_main(bus, g_main_context_default()); + atspi_dbus_connection_setup_with_g_main(bus, g_main_context_default()); cnx = droute_new (bus); path = droute_add_one (cnx, TEST_OBJECT_PATH, object); |