diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-08-16 14:34:36 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-08-16 14:34:36 +0200 |
| commit | e59679246ef6faf4348e2055db80baa8dec380e5 (patch) | |
| tree | 47220e36c65d9ecf706cb8fdc0b9b652f1fef421 /src/core | |
| parent | ab5838fce7408061514b6322a39b1b5e27cc19b1 (diff) | |
| parent | d4d00020d6ad855d65d31020fefa5003e1bb477f (diff) | |
Merge pull request #932 from kaysievers/bus
sd-bus: do not connect to dbus-1 socket when kdbus is available
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/automount.c | 1 | ||||
| -rw-r--r-- | src/core/service.c | 1 | ||||
| -rw-r--r-- | src/core/socket.c | 1 | ||||
| -rw-r--r-- | src/core/timer.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/src/core/automount.c b/src/core/automount.c index 4af381b4b6..2b84c441b2 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -39,7 +39,6 @@ #include "path-util.h" #include "dbus-automount.h" #include "bus-util.h" -#include "bus-error.h" #include "formats-util.h" #include "process-util.h" #include "async.h" diff --git a/src/core/service.c b/src/core/service.c index b790ec98be..7bd8cb8b91 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -42,7 +42,6 @@ #include "utf8.h" #include "env-util.h" #include "fileio.h" -#include "bus-error.h" #include "bus-util.h" #include "bus-kernel.h" #include "formats-util.h" diff --git a/src/core/socket.c b/src/core/socket.c index a387057473..c78e8ad01b 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -43,7 +43,6 @@ #include "def.h" #include "smack-util.h" #include "bus-util.h" -#include "bus-error.h" #include "selinux-util.h" #include "dbus-socket.h" #include "unit.h" diff --git a/src/core/timer.c b/src/core/timer.c index 7f4a2eb716..51cd56ca84 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -27,7 +27,6 @@ #include "dbus-timer.h" #include "special.h" #include "bus-util.h" -#include "bus-error.h" static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = { [TIMER_DEAD] = UNIT_INACTIVE, |