X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Ftest-inhibit.c;h=7b6deffc3ede7406bcc1d3fd7adba5ba2adf136d;hb=737563e4bb1606cae1dd0e9484f9e82da466fe76;hp=c83e960d3e9d0634c79c0a401c64e3f6bcf9dc5b;hpb=f8e2fb7b14e53f5a4bcfd66d26910af1dee185c6;p=elogind.git

diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c
index c83e960d3..7b6deffc3 100644
--- a/src/login/test-inhibit.c
+++ b/src/login/test-inhibit.c
@@ -30,7 +30,7 @@
 static int inhibit(DBusConnection *bus, const char *what) {
         DBusMessage *m, *reply;
         DBusError error;
-        const char *who = "Test Tool", *reason = "Just because!";
+        const char *who = "Test Tool", *reason = "Just because!", *mode = "block";
         int fd;
 
         dbus_error_init(&error);
@@ -46,6 +46,7 @@ static int inhibit(DBusConnection *bus, const char *what) {
                                            DBUS_TYPE_STRING, &what,
                                            DBUS_TYPE_STRING, &who,
                                            DBUS_TYPE_STRING, &reason,
+                                           DBUS_TYPE_STRING, &mode,
                                            DBUS_TYPE_INVALID));
 
         reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
@@ -83,19 +84,20 @@ static void print_inhibitors(DBusConnection *bus) {
         dbus_message_iter_recurse(&iter, &sub);
 
         while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
-                const char *what, *who, *reason;
+                const char *what, *who, *why, *mode;
                 dbus_uint32_t uid, pid;
 
                 dbus_message_iter_recurse(&sub, &sub2);
 
                 assert_se(bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &what, true) >= 0);
                 assert_se(bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &who, true) >= 0);
-                assert_se(bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &reason, true) >= 0);
+                assert_se(bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &why, true) >= 0);
+                assert_se(bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &mode, true) >= 0);
                 assert_se(bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &uid, true) >= 0);
                 assert_se(bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &pid, false) >= 0);
 
-                printf("what=<%s> who=<%s> reason=<%s> uid=<%lu> pid=<%lu>\n",
-                       what, who, reason, (unsigned long) uid, (unsigned long) pid);
+                printf("what=<%s> who=<%s> why=<%s> mode=<%s> uid=<%lu> pid=<%lu>\n",
+                       what, who, why, mode, (unsigned long) uid, (unsigned long) pid);
 
                 dbus_message_iter_next(&sub);
 
@@ -117,7 +119,7 @@ int main(int argc, char*argv[]) {
 
         print_inhibitors(bus);
 
-        fd1 = inhibit(bus, "suspend");
+        fd1 = inhibit(bus, "sleep");
         assert(fd1 >= 0);
         print_inhibitors(bus);