diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-07-04 16:48:24 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-07-04 16:48:24 +0200 |
| commit | 14ad1d1437f51b8ebc8dc6e8d3707b41d48d0a3a (patch) | |
| tree | 33d7b111a9fa5610e3ac6ac3a4aab43e9b9a935a | |
| parent | 82c121a4754a9d405b07c75796e329942af2ccc5 (diff) | |
dbus: include NextElapse field in timer properties
| -rw-r--r-- | src/dbus-timer.c | 2 | ||||
| -rw-r--r-- | src/systemctl.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/dbus-timer.c b/src/dbus-timer.c index af0ae72f4f..d548227b5a 100644 --- a/src/dbus-timer.c +++ b/src/dbus-timer.c @@ -29,6 +29,7 @@ " <interface name=\"org.freedesktop.systemd1.Timer\">\n" \ " <property name=\"Unit\" type=\"s\" access=\"read\"/>\n" \ " <property name=\"Timers\" type=\"a(stt)\" access=\"read\"/>\n" \ + " <property name=\"NextElapse\" type=\"t\" access=\"read\"/>\n" \ " </interface>\n" #define INTROSPECTION \ @@ -77,6 +78,7 @@ DBusHandlerResult bus_timer_message_handler(Unit *u, DBusConnection *c, DBusMess BUS_UNIT_PROPERTIES, { "org.freedesktop.systemd1.Timer", "Unit", bus_property_append_string, "s", u->timer.unit->meta.id }, { "org.freedesktop.systemd1.Timer", "Timers", bus_timer_append_timers, "a(stt)", u }, + { "org.freedesktop.systemd1.Timer", "NextElapse", bus_property_append_usec, "t", &u->timer.next_elapse }, { NULL, NULL, NULL, NULL, NULL } }; diff --git a/src/systemctl.c b/src/systemctl.c index 392ecf2c92..f97fa10390 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -1024,7 +1024,7 @@ static int print_property(const char *name, DBusMessageIter *iter) { /* Yes, heuristics! But we can change this check * should it turn out to not be sufficient */ - if (strstr(name, "Timestamp") || strstr(name, "Elapse")) { + if (strstr(name, "Timestamp")) { char timestamp[FORMAT_TIMESTAMP_MAX], *t; if ((t = format_timestamp(timestamp, sizeof(timestamp), u)) || arg_all) |