From 718db96199eb307751264e4163555662c9a389fa Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 Nov 2013 21:12:59 +0100 Subject: core: convert PID 1 to libsystemd-bus This patch converts PID 1 to libsystemd-bus and thus drops the dependency on libdbus. The only remaining code using libdbus is a test case that validates our bus marshalling against libdbus' marshalling, and this dependency can be turned off. This patch also adds a couple of things to libsystem-bus, that are necessary to make the port work: - Synthesizing of "Disconnected" messages when bus connections are severed. - Support for attaching multiple vtables for the same interface on the same path. This patch also fixes the SetDefaultTarget() and GetDefaultTarget() bus calls which used an inappropriate signature. As a side effect we will now generate PropertiesChanged messages which carry property contents, rather than just invalidation information. --- src/core/dbus-kill.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/core/dbus-kill.h') diff --git a/src/core/dbus-kill.h b/src/core/dbus-kill.h index 7676d98e91..7c15f3a90b 100644 --- a/src/core/dbus-kill.h +++ b/src/core/dbus-kill.h @@ -21,17 +21,10 @@ along with systemd; If not, see . ***/ -#include +#include "sd-bus.h" +#include "unit.h" +#include "kill.h" -#include "manager.h" -#include "dbus-common.h" +extern const sd_bus_vtable bus_kill_vtable[]; -#define BUS_KILL_CONTEXT_INTERFACE \ - " \n" \ - " \n" \ - " \n" \ - " \n" - -extern const BusProperty bus_kill_context_properties[]; - -int bus_kill_context_set_transient_property(Unit *u, KillContext *c, const char *name, DBusMessageIter *i, UnitSetPropertiesMode mode, DBusError *error); +int bus_kill_context_set_transient_property(Unit *u, KillContext *c, const char *name, sd_bus_message *message, UnitSetPropertiesMode mode, sd_bus_error *error); -- cgit v1.2.3-54-g00ecf