X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus-job.c;h=48b1588deea8b133c8343f9ef25187cbd643941a;hp=3a6e7159e9959edc41a9623d8ec2d4e90896245b;hb=c0115b1f4a09b709a2d062a4f2baf21203c808bd;hpb=e99e38bbdcca3fe5956823bdb3d38544ccf93221
diff --git a/src/dbus-job.c b/src/dbus-job.c
index 3a6e7159e..48b1588de 100644
--- a/src/dbus-job.c
+++ b/src/dbus-job.c
@@ -25,20 +25,25 @@
#include "log.h"
#include "dbus-job.h"
-static const char introspection[] =
- DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
- ""
- " "
- " "
- " "
- " "
- " "
- " "
- " "
- " "
- BUS_PROPERTIES_INTERFACE
- BUS_INTROSPECTABLE_INTERFACE
- "";
+#define BUS_JOB_INTERFACE \
+ " \n" \
+ " \n" \
+ " \n" \
+ " \n" \
+ " \n" \
+ " \n" \
+ " \n" \
+ " \n"
+
+#define INTROSPECTION \
+ DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \
+ "\n" \
+ BUS_JOB_INTERFACE \
+ BUS_PROPERTIES_INTERFACE \
+ BUS_INTROSPECTABLE_INTERFACE \
+ "\n"
+
+const char bus_job_interface[] = BUS_JOB_INTERFACE;
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);
@@ -73,7 +78,7 @@ static int bus_job_append_unit(Manager *m, DBusMessageIter *i, const char *prope
return 0;
}
-static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusMessage *message) {
+static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusConnection *connection, DBusMessage *message) {
const BusProperty properties[] = {
{ "org.freedesktop.systemd1.Job", "Id", bus_property_append_uint32, "u", &j->id },
{ "org.freedesktop.systemd1.Job", "State", bus_job_append_state, "s", &j->state },
@@ -83,7 +88,6 @@ static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusMessage *message)
};
DBusMessage *reply = NULL;
- Manager *m = j->manager;
if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Job", "Cancel")) {
if (!(reply = dbus_message_new_method_return(message)))
@@ -92,10 +96,10 @@ static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusMessage *message)
job_free(j);
} else
- return bus_default_message_handler(j->manager, message, introspection, properties);
+ return bus_default_message_handler(j->manager, connection, message, INTROSPECTION, properties);
if (reply) {
- if (!dbus_connection_send(m->api_bus, reply, NULL))
+ if (!dbus_connection_send(connection, reply, NULL))
goto oom;
dbus_message_unref(reply);
@@ -110,7 +114,7 @@ oom:
return DBUS_HANDLER_RESULT_NEED_MEMORY;
}
-static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBusMessage *message, void *data) {
+static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBusMessage *message, void *data) {
Manager *m = data;
Job *j;
int r;
@@ -132,10 +136,10 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DB
if (r == -ENOENT)
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- return bus_send_error_reply(m, message, NULL, r);
+ return bus_send_error_reply(m, connection, message, NULL, r);
}
- return bus_job_message_dispatch(j, message);
+ return bus_job_message_dispatch(j, connection, message);
}
const DBusObjectPathVTable bus_job_vtable = {
@@ -178,7 +182,7 @@ void bus_job_send_change_signal(Job *j) {
goto oom;
}
- if (!dbus_connection_send(j->manager->api_bus, m, NULL))
+ if (bus_broadcast(j->manager, m) < 0)
goto oom;
free(p);
@@ -197,15 +201,19 @@ oom:
log_error("Failed to allocate job change signal.");
}
-void bus_job_send_removed_signal(Job *j) {
+void bus_job_send_removed_signal(Job *j, bool success) {
char *p = NULL;
DBusMessage *m = NULL;
+ dbus_bool_t b = success;
assert(j);
- if (set_isempty(j->manager->subscribed) || !j->sent_dbus_new_signal)
+ if (set_isempty(j->manager->subscribed))
return;
+ if (!j->sent_dbus_new_signal)
+ bus_job_send_change_signal(j);
+
if (!(p = job_dbus_path(j)))
goto oom;
@@ -215,10 +223,11 @@ void bus_job_send_removed_signal(Job *j) {
if (!dbus_message_append_args(m,
DBUS_TYPE_UINT32, &j->id,
DBUS_TYPE_OBJECT_PATH, &p,
+ DBUS_TYPE_BOOLEAN, &b,
DBUS_TYPE_INVALID))
goto oom;
- if (!dbus_connection_send(j->manager->api_bus, m, NULL))
+ if (bus_broadcast(j->manager, m) < 0)
goto oom;
free(p);