diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-05-08 20:23:45 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-05-08 20:23:45 +0000 |
| commit | e7d668ac9e813bc9922ee7d771848bd8822d5d1f (patch) | |
| tree | 34e2fc7b1c064beaa52e5e05e9278be458be9fba /serial | |
| parent | 44a204a75880c342c3ac9066072f102f773a539a (diff) | |
Move D-Bus watch functions into libgdbus
Diffstat (limited to 'serial')
| -rw-r--r-- | serial/Makefile.am | 4 | ||||
| -rw-r--r-- | serial/main.c | 3 | ||||
| -rw-r--r-- | serial/manager.c | 7 | ||||
| -rw-r--r-- | serial/port.c | 7 |
4 files changed, 12 insertions, 9 deletions
diff --git a/serial/Makefile.am b/serial/Makefile.am index 226ba030..2f2286bf 100644 --- a/serial/Makefile.am +++ b/serial/Makefile.am @@ -9,12 +9,12 @@ libserial_la_SOURCES = main.c \ storage.h storage.c LDADD = $(top_builddir)/common/libhelper.a \ - @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ + @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ endif AM_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid -I$(top_srcdir)/sdpd diff --git a/serial/main.c b/serial/main.c index 57a65f88..b4533a01 100644 --- a/serial/main.c +++ b/serial/main.c @@ -30,10 +30,11 @@ #include <sys/types.h> #include <bluetooth/bluetooth.h> + +#include <glib.h> #include <dbus/dbus.h> #include "plugin.h" -#include "dbus.h" #include "dbus-service.h" #include "manager.h" diff --git a/serial/manager.c b/serial/manager.c index 54e052da..a10e1631 100644 --- a/serial/manager.c +++ b/serial/manager.c @@ -40,8 +40,6 @@ #include <sys/types.h> #include <sys/un.h> -#include <glib.h> - #include <bluetooth/bluetooth.h> #include <bluetooth/hci.h> #include <bluetooth/hci_lib.h> @@ -49,7 +47,10 @@ #include <bluetooth/sdp_lib.h> #include <bluetooth/rfcomm.h> -#include "dbus.h" +#include <glib.h> + +#include <gdbus.h> + #include "dbus-helper.h" #include "logging.h" #include "textfile.h" diff --git a/serial/port.c b/serial/port.c index f2c0eb61..98b751be 100644 --- a/serial/port.c +++ b/serial/port.c @@ -36,12 +36,13 @@ #include <sys/stat.h> #include <fcntl.h> -#include <glib.h> - #include <bluetooth/bluetooth.h> #include <bluetooth/rfcomm.h> -#include "dbus.h" +#include <glib.h> + +#include <gdbus.h> + #include "dbus-helper.h" #include "logging.h" |