summaryrefslogtreecommitdiffstats
path: root/daemon
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-05-08 22:19:14 +0000
committerMarcel Holtmann <marcel@holtmann.org>2008-05-08 22:19:14 +0000
commit15ea15b3a752f0487bc50d0ea04925f1b9d33dcb (patch)
tree1ec75fe77a089c0678bdbc24d7ad2bd85a6fa1c9 /daemon
parente7d668ac9e813bc9922ee7d771848bd8822d5d1f (diff)
Move D-Bus object and interface helpers into libgdbus
Diffstat (limited to 'daemon')
-rw-r--r--daemon/adapter.c2
-rw-r--r--daemon/database.c3
-rw-r--r--daemon/main.c4
-rw-r--r--daemon/manager.c2
-rw-r--r--daemon/service.c3
5 files changed, 3 insertions, 11 deletions
diff --git a/daemon/adapter.c b/daemon/adapter.c
index d8e4c9d4..2c5e608e 100644
--- a/daemon/adapter.c
+++ b/daemon/adapter.c
@@ -26,8 +26,8 @@
#endif
#include <dbus/dbus.h>
+#include <gdbus.h>
-#include "dbus-helper.h"
#include "logging.h"
#include "system.h"
diff --git a/daemon/database.c b/daemon/database.c
index b7d5562d..f0c8b38d 100644
--- a/daemon/database.c
+++ b/daemon/database.c
@@ -33,12 +33,9 @@
#include <bluetooth/sdp_lib.h>
#include <glib.h>
-
#include <dbus/dbus.h>
-
#include <gdbus.h>
-#include "dbus-helper.h"
#include "sdp-xml.h"
#include "logging.h"
diff --git a/daemon/main.c b/daemon/main.c
index 0c735c35..a1b58ada 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -34,13 +34,9 @@
#include <sys/stat.h>
#include <glib.h>
-
#include <dbus/dbus.h>
-
#include <gdbus.h>
-#include "dbus-helper.h"
-
#include "logging.h"
#include "sdpd.h"
diff --git a/daemon/manager.c b/daemon/manager.c
index 3c30575c..92e34dd5 100644
--- a/daemon/manager.c
+++ b/daemon/manager.c
@@ -26,8 +26,8 @@
#endif
#include <dbus/dbus.h>
+#include <gdbus.h>
-#include "dbus-helper.h"
#include "logging.h"
#include "system.h"
diff --git a/daemon/service.c b/daemon/service.c
index 27ed2417..7668d653 100644
--- a/daemon/service.c
+++ b/daemon/service.c
@@ -30,10 +30,9 @@
#include <signal.h>
#include <glib.h>
-
#include <dbus/dbus.h>
+#include <gdbus.h>
-#include "dbus-helper.h"
#include "logging.h"
#include "system.h"