From eb93e2537a60db963bac84e189c52b3d83521c63 Mon Sep 17 00:00:00 2001
From: Marc-André Lureau <marc-andre.lureau@nokia.com>
Date: Thu, 19 Mar 2009 01:35:02 +0200
Subject: dbus: split dbus-util into dbus-shared

modules: fix dbus-util include
pulse: get dbus at context connection
---
 src/modules/bluetooth/bluetooth-util.c             | 2 +-
 src/modules/bluetooth/module-bluetooth-device.c    | 3 +--
 src/modules/bluetooth/module-bluetooth-discover.c  | 2 +-
 src/modules/bluetooth/module-bluetooth-proximity.c | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/modules/bluetooth')

diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index 3dfc65e7..1cdade99 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -25,7 +25,7 @@
 
 #include <pulsecore/core-util.h>
 #include <pulsecore/shared.h>
-#include <modules/dbus-util.h>
+#include <pulsecore/dbus-shared.h>
 
 #include "bluetooth-util.h"
 
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 2500fb09..2ff64ba9 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -46,8 +46,7 @@
 #include <pulsecore/time-smoother.h>
 #include <pulsecore/rtclock.h>
 #include <pulsecore/namereg.h>
-
-#include <modules/dbus-util.h>
+#include <pulsecore/dbus-shared.h>
 
 #include "module-bluetooth-device-symdef.h"
 #include "ipc.h"
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 3288cc55..46f8b723 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -34,7 +34,7 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/llist.h>
 #include <pulsecore/core-util.h>
-#include <modules/dbus-util.h>
+#include <pulsecore/dbus-shared.h>
 
 #include "module-bluetooth-discover-symdef.h"
 #include "bluetooth-util.h"
diff --git a/src/modules/bluetooth/module-bluetooth-proximity.c b/src/modules/bluetooth/module-bluetooth-proximity.c
index c8d7b4d9..9993c8dc 100644
--- a/src/modules/bluetooth/module-bluetooth-proximity.c
+++ b/src/modules/bluetooth/module-bluetooth-proximity.c
@@ -42,8 +42,8 @@
 #include <pulsecore/core-util.h>
 #include <pulsecore/core-error.h>
 #include <pulsecore/start-child.h>
+#include <pulsecore/dbus-shared.h>
 
-#include "../dbus-util.h"
 #include "module-bluetooth-proximity-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering");
-- 
cgit