diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-05-08 19:12:44 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-05-08 19:12:44 +0000 |
| commit | 33191e6275ab82aa4161cdf75b45597e4d1568ec (patch) | |
| tree | d20e3027a12c57aee6ef221ff8cc347f4e2f9989 /cups | |
| parent | 6bf91edf6cdb840c0f40572f1a20d381fd2cdc5e (diff) | |
Move D-Bus mainloop integration into libgdbus
Diffstat (limited to 'cups')
| -rw-r--r-- | cups/Makefile.am | 4 | ||||
| -rw-r--r-- | cups/main.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cups/Makefile.am b/cups/Makefile.am index 853c436d..f01665ee 100644 --- a/cups/Makefile.am +++ b/cups/Makefile.am @@ -7,10 +7,10 @@ cups_PROGRAMS = bluetooth bluetooth_SOURCES = main.c cups.h sdp.c spp.c hcrp.c bluetooth_LDADD = $(top_builddir)/common/libhelper.a \ - @DBUS_LIBS@ @GLIB_LIBS@ @BLUEZ_LIBS@ + @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ endif -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ INCLUDES = -I$(top_srcdir)/common diff --git a/cups/main.c b/cups/main.c index ac77e85d..b36b2074 100644 --- a/cups/main.c +++ b/cups/main.c @@ -38,10 +38,9 @@ #include <bluetooth/sdp.h> #include <bluetooth/sdp_lib.h> -#include <glib.h> +#include <gdbus.h> #include "cups.h" -#include "dbus.h" #include "sdp-xml.h" extern int sdp_search_spp(sdp_session_t *sdp, uint8_t *channel); @@ -456,7 +455,7 @@ static gboolean list_printers(void) char *adapter, *match; guint len; - conn = init_dbus(NULL, NULL, NULL); + conn = dbus_bus_system_setup_with_main_loop("org.bluez", NULL, NULL); if (conn == NULL) return FALSE; |