From: Lennart Poettering Date: Wed, 20 Dec 2017 15:40:47 +0000 (+0100) Subject: tree-wide: make the Subscribe() method calls asynchronous too X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8ed0b7636811562e8cac5483249ebe231d387731;p=elogind.git tree-wide: make the Subscribe() method calls asynchronous too --- diff --git a/src/login/logind.c b/src/login/logind.c index 2f7243ba2..0238cd889 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -688,7 +688,6 @@ static int manager_reserve_vt(Manager *m) { #endif // 0 static int manager_connect_bus(Manager *m) { - _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; int r; assert(m); @@ -771,19 +770,18 @@ static int manager_connect_bus(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to request match for Reloading: %m"); - r = sd_bus_call_method( + r = sd_bus_call_method_async( m->bus, + NULL, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "Subscribe", - &error, - NULL, NULL); - if (r < 0) { - log_error("Failed to enable subscription: %s", bus_error_message(&error, r)); - return r; - } #endif // 0 + NULL, NULL, + NULL); + if (r < 0) + return log_error_errno(r, "Failed to enable subscription: %m"); r = sd_bus_request_name_async(m->bus, NULL, "org.freedesktop.login1", 0, NULL, NULL); if (r < 0)