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/login/logind-dbus.c | 3 ++- src/login/logind-inhibit.c | 2 +- src/login/logind-seat-dbus.c | 1 + src/login/logind-session-dbus.c | 1 + src/login/logind-session.c | 2 +- src/login/logind.c | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/login') diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 0f25e2306f..7e6f6109dc 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -40,6 +40,7 @@ #include "bus-util.h" #include "bus-error.h" #include "logind.h" +#include "bus-errors.h" static int property_get_idle_hint( sd_bus *bus, @@ -184,7 +185,7 @@ static int method_get_session_by_pid(sd_bus *bus, sd_bus_message *message, void p = session_bus_path(session); if (!p) - return sd_bus_reply_method_errno(bus, message, -ENOMEM, NULL); + return sd_bus_reply_method_errno(bus, message, ENOMEM, NULL); return sd_bus_reply_method_return(bus, message, "o", p); } diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index 26cce8d7fc..1b6f1362b3 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -304,7 +304,7 @@ int inhibitor_create_fifo(Inhibitor *i) { if (r < 0) return r; - r = sd_event_source_set_priority(i->event_source, SD_PRIORITY_IDLE); + r = sd_event_source_set_priority(i->event_source, SD_EVENT_PRIORITY_IDLE); if (r < 0) return r; } diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c index c59dfd9338..53141a892e 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/login/logind-seat-dbus.c @@ -25,6 +25,7 @@ #include "util.h" #include "bus-util.h" #include "strv.h" +#include "bus-errors.h" #include "logind.h" #include "logind-seat.h" diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index fa9c0039f4..4995391443 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -25,6 +25,7 @@ #include "util.h" #include "strv.h" #include "bus-util.h" +#include "bus-errors.h" #include "logind.h" #include "logind-session.h" diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 65cc6f3094..d3433731e5 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -864,7 +864,7 @@ int session_create_fifo(Session *s) { if (r < 0) return r; - r = sd_event_source_set_priority(s->fifo_event_source, SD_PRIORITY_IDLE); + r = sd_event_source_set_priority(s->fifo_event_source, SD_EVENT_PRIORITY_IDLE); if (r < 0) return r; } diff --git a/src/login/logind.c b/src/login/logind.c index 1d16eaa7b8..47b306b619 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -958,7 +958,7 @@ static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *us return r; } - r = sd_event_source_set_priority(m->idle_action_event_source, SD_PRIORITY_IDLE+10); + r = sd_event_source_set_priority(m->idle_action_event_source, SD_EVENT_PRIORITY_IDLE+10); if (r < 0) { log_error("Failed to set idle event source priority: %s", strerror(-r)); return r; -- cgit v1.2.3-54-g00ecf