X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-session-dbus.c;h=7d81500426dc0e7bbc5fed8c153a2f08b6bab719;hb=5ed1227238724959f020169f5332086439709b55;hp=c3d4d60158f274c3b221086a917989fdc0f9d80b;hpb=236af516b866473c22f980b556a2d7535cef4d9b;p=elogind.git diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index c3d4d6015..7d8150042 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -27,6 +27,7 @@ #include "strv.h" #include "bus-util.h" #include "bus-errors.h" +#include "bus-label.h" #include "logind.h" #include "logind-session.h" @@ -492,7 +493,7 @@ int session_object_find(sd_bus *bus, const char *path, const char *interface, vo sd_bus_message *message; pid_t pid; - message = sd_bus_get_current(bus); + message = sd_bus_get_current_message(bus); if (!message) return 0; @@ -515,7 +516,7 @@ int session_object_find(sd_bus *bus, const char *path, const char *interface, vo if (!p) return 0; - e = sd_bus_label_unescape(p); + e = bus_label_unescape(p); if (!e) return -ENOMEM; @@ -533,7 +534,7 @@ char *session_bus_path(Session *s) { assert(s); - t = sd_bus_label_escape(s->id); + t = bus_label_escape(s->id); if (!t) return NULL;