From 06dab8e18aebf822392c7ca66c5bf3c1200fdec8 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 3 May 2012 22:53:25 +0200
Subject: dbus: include unit name in JobNew/JobRemoved signals

This breaks D-Bus interface slightly, but since the D-Bus API isn't
covered by the interface stability promise this should be OK.
---
 src/core/dbus-job.c     | 2 ++
 src/core/dbus-manager.c | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'src/core')

diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
index 446f809bff..1b01ead2da 100644
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -295,6 +295,7 @@ static DBusMessage* new_change_signal_message(Job *j) {
                 if (!dbus_message_append_args(m,
                                               DBUS_TYPE_UINT32, &j->id,
                                               DBUS_TYPE_OBJECT_PATH, &p,
+                                              DBUS_TYPE_STRING, &j->unit->id,
                                               DBUS_TYPE_INVALID))
                         goto oom;
         }
@@ -326,6 +327,7 @@ static DBusMessage* new_removed_signal_message(Job *j) {
         if (!dbus_message_append_args(m,
                                       DBUS_TYPE_UINT32, &j->id,
                                       DBUS_TYPE_OBJECT_PATH, &p,
+                                      DBUS_TYPE_STRING, &j->unit->id,
                                       DBUS_TYPE_STRING, &r,
                                       DBUS_TYPE_INVALID))
                 goto oom;
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 6655f2940c..b5b51133f4 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -198,10 +198,12 @@
         "  <signal name=\"JobNew\">\n"                                  \
         "   <arg name=\"id\" type=\"u\"/>\n"                            \
         "   <arg name=\"job\" type=\"o\"/>\n"                           \
+        "   <arg name=\"unit\" type=\"s\"/>\n"                          \
         "  </signal>\n"                                                 \
         "  <signal name=\"JobRemoved\">\n"                              \
         "   <arg name=\"id\" type=\"u\"/>\n"                            \
         "   <arg name=\"job\" type=\"o\"/>\n"                           \
+        "   <arg name=\"unit\" type=\"s\"/>\n"                          \
         "   <arg name=\"result\" type=\"s\"/>\n"                        \
         "  </signal>"                                                   \
         "  <signal name=\"StartupFinished\">\n"                         \
-- 
cgit v1.2.3-54-g00ecf