From e7d668ac9e813bc9922ee7d771848bd8822d5d1f Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 8 May 2008 20:23:45 +0000
Subject: Move D-Bus watch functions into libgdbus

---
 audio/Makefile.am | 4 ++--
 audio/avdtp.c     | 6 +++---
 audio/control.c   | 7 +++----
 audio/device.c    | 7 +++----
 audio/headset.c   | 2 --
 audio/main.c      | 3 +--
 audio/sink.c      | 5 ++---
 7 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'audio')

diff --git a/audio/Makefile.am b/audio/Makefile.am
index 841617ea..21d48860 100644
--- a/audio/Makefile.am
+++ b/audio/Makefile.am
@@ -14,7 +14,7 @@ libaudio_la_SOURCES = main.c \
 libaudio_la_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc
 
 LDADD = $(top_builddir)/common/libhelper.a \
-		@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
+		@GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
 
 if ALSA
 alsadir = $(libdir)/alsa-lib
@@ -52,7 +52,7 @@ libgstbluetooth_la_CFLAGS = @GSTREAMER_CFLAGS@ @SBC_CFLAGS@
 endif
 endif
 
-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/audio/avdtp.c b/audio/avdtp.c
index 3c35bfc1..300898e2 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -34,12 +34,12 @@
 #include <signal.h>
 #include <netinet/in.h>
 
-#include <glib.h>
-
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 
-#include "dbus.h"
+#include <glib.h>
+#include <dbus/dbus.h>
+
 #include "dbus-service.h"
 #include "logging.h"
 
diff --git a/audio/control.c b/audio/control.c
index a6976d05..cffcf517 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -37,15 +37,14 @@
 #include <fcntl.h>
 #include <netinet/in.h>
 
-#include <glib.h>
-#include <dbus/dbus.h>
-
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 #include <bluetooth/l2cap.h>
 
-#include "dbus.h"
+#include <glib.h>
+#include <dbus/dbus.h>
+
 #include "dbus-helper.h"
 #include "dbus-service.h"
 #include "logging.h"
diff --git a/audio/device.c b/audio/device.c
index 0debe220..c385c7ca 100644
--- a/audio/device.c
+++ b/audio/device.c
@@ -32,16 +32,15 @@
 #include <sys/stat.h>
 #include <netinet/in.h>
 
-#include <glib.h>
-#include <dbus/dbus.h>
-
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
-#include "dbus.h"
+#include <glib.h>
+#include <dbus/dbus.h>
+
 #include "dbus-helper.h"
 #include "logging.h"
 #include "textfile.h"
diff --git a/audio/headset.c b/audio/headset.c
index 859a87ba..2d635110 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -47,10 +47,8 @@
 #include <bluetooth/sdp_lib.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
 
-#include "dbus.h"
 #include "dbus-helper.h"
 #include "logging.h"
 #include "device.h"
diff --git a/audio/main.c b/audio/main.c
index 5b4e395b..ef606223 100644
--- a/audio/main.c
+++ b/audio/main.c
@@ -31,8 +31,7 @@
 #include <bluetooth/bluetooth.h>
 
 #include <glib.h>
-
-#include "dbus.h"
+#include <dbus/dbus.h>
 
 #include "plugin.h"
 #include "dbus-service.h"
diff --git a/audio/sink.c b/audio/sink.c
index b44f8de6..b755759d 100644
--- a/audio/sink.c
+++ b/audio/sink.c
@@ -29,12 +29,11 @@
 #include <stdint.h>
 #include <errno.h>
 
+#include <bluetooth/bluetooth.h>
+
 #include <glib.h>
 #include <dbus/dbus.h>
 
-#include <bluetooth/bluetooth.h>
-
-#include "dbus.h"
 #include "dbus-helper.h"
 #include "logging.h"
 
-- 
cgit