cgroup: only delete empty cgroups

[elogind.git] / dbus-job.c

diff --git a/dbus-job.c b/dbus-job.c
index 9c6a798075600cd0a910219e45b7edf43ed24aa4..bec5bca93cac8215f1c9af2f5662c14d2bdc6b2e 100644 (file)
--- a/dbus-job.c
+++ b/dbus-job.c
@@ -23,6 +23,7 @@
 
 #include "dbus.h"
 #include "log.h"
+#include "dbus-job.h"
 
 static const char introspection[] =
         DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
@@ -39,14 +40,13 @@ static const char introspection[] =
         BUS_INTROSPECTABLE_INTERFACE
         "</node>";
 
-DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_job_append_state, job_state, JobState);
-DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_job_append_type, job_type, JobType);
+static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_job_append_state, job_state, JobState);
+static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_job_append_type, job_type, JobType);
 
 static int bus_job_append_unit(Manager *m, DBusMessageIter *i, const char *property, void *data) {
         Job *j = data;
         DBusMessageIter sub;
         char *p;
-        const char *id;
 
         assert(m);
         assert(i);
@@ -59,9 +59,7 @@ static int bus_job_append_unit(Manager *m, DBusMessageIter *i, const char *prope
         if (!(p = unit_dbus_path(j->unit)))
                 return -ENOMEM;
 
-        id = unit_id(j->unit);
-
-        if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &id) ||
+        if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &j->unit->meta.id) ||
             !dbus_message_iter_append_basic(&sub, DBUS_TYPE_OBJECT_PATH, &p)) {
                 free(p);
                 return -ENOMEM;