From 15ea15b3a752f0487bc50d0ea04925f1b9d33dcb Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 8 May 2008 22:19:14 +0000
Subject: Move D-Bus object and interface helpers into libgdbus

---
 daemon/adapter.c  | 2 +-
 daemon/database.c | 3 ---
 daemon/main.c     | 4 ----
 daemon/manager.c  | 2 +-
 daemon/service.c  | 3 +--
 5 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'daemon')

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"
-- 
cgit