diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-03-30 20:26:27 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-03-30 20:26:27 +0200 |
| commit | d33be12fde0910e4a7515c3f6a8b8f2165624cb0 (patch) | |
| tree | 43b62e47c2a673eeabca86136a3c73aa6233e1fc /src/modules/bluetooth | |
| parent | 649c982222f520fdd4afae8880c622437d4ba585 (diff) | |
| parent | 8491b47a5164fdff10724bfe74411791dc0ff912 (diff) | |
Merge commit 'elmarco/dbus'
Diffstat (limited to 'src/modules/bluetooth')
| -rw-r--r-- | src/modules/bluetooth/bluetooth-util.c | 2 | ||||
| -rw-r--r-- | src/modules/bluetooth/module-bluetooth-device.c | 3 | ||||
| -rw-r--r-- | src/modules/bluetooth/module-bluetooth-discover.c | 2 | ||||
| -rw-r--r-- | src/modules/bluetooth/module-bluetooth-proximity.c | 2 |
4 files changed, 4 insertions, 5 deletions
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"); |