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-mount.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/core/dbus-mount.h') diff --git a/src/core/dbus-mount.h b/src/core/dbus-mount.h index f4ec8b1625..4bb5d2ddee 100644 --- a/src/core/dbus-mount.h +++ b/src/core/dbus-mount.h @@ -21,14 +21,11 @@ along with systemd; If not, see . ***/ -#include - +#include "sd-bus.h" #include "unit.h" -DBusHandlerResult bus_mount_message_handler(Unit *u, DBusConnection *c, DBusMessage *message); +extern const sd_bus_vtable bus_mount_vtable[]; +extern const char * const bus_mount_changing_properties[]; -int bus_mount_set_property(Unit *u, const char *name, DBusMessageIter *i, UnitSetPropertiesMode mode, DBusError *error); +int bus_mount_set_property(Unit *u, const char *name, sd_bus_message *message, UnitSetPropertiesMode mode, sd_bus_error *error); int bus_mount_commit_properties(Unit *u); - -extern const char bus_mount_interface[]; -extern const char bus_mount_invalidating_properties[]; -- cgit v1.2.3-54-g00ecf