Merge lp:~mfisch/powerd/list-requests into lp:powerd

[Matt Fischer]

Add the state info to listRequests

Add the state info to the listrequest call

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:15
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mfisch/powerd/list-requests/+merge/164992/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/powerd-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-raring-armhf-ci/12

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/12/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'data/com.canonical.powerd.xml'
--- data/com.canonical.powerd.xml	2013-05-20 19:08:12 +0000
+++ data/com.canonical.powerd.xml	2013-05-21 23:44:26 +0000
@@ -16,7 +16,7 @@
 
     <!-- for debug/testing -->
     <method name="listSysRequests">
-      <arg type="a(si)" name="requestList" direction="out" /> 
+      <arg type="a(sii)" name="requestList" direction="out" /> 
     </method>
 
     <!-- Signals -->

=== modified file 'src/power-request.c'
--- src/power-request.c	2013-05-21 21:45:44 +0000
+++ src/power-request.c	2013-05-21 23:44:26 +0000
@@ -113,12 +113,12 @@
                 struct SysStateRequest *sr = (struct SysStateRequest *)iterator->data;
                 // XXX - we should probably not dump the cookie here, it's a
                 // security risk
-                g_message("  Owner: %s, Pid: %d, Cookie: %u",
-                          sr->owner->str, sr->pid, sr->cookie);
+                g_message("  Owner: %s, Pid: %d, Cookie: %u, State: %s (%d)",
+                    sr->owner->str, sr->pid, sr->cookie,
+                    state_to_string(sr->state), sr->state);
                 if (builder) {
-                    // XXX - we may want to return state here too if we have
-                    // more than 1
-                    g_variant_builder_add(builder, "(si)", sr->owner->str, sr->pid);
+                    g_variant_builder_add(builder, "(sii)", sr->owner->str,
+                        sr->pid, sr->state);
                     count++;
                 }
             }
@@ -135,14 +135,14 @@
     GVariantBuilder *builder;
     gint count = 0;
 
-    builder = g_variant_builder_new(G_VARIANT_TYPE("a(si)"));
+    builder = g_variant_builder_new(G_VARIANT_TYPE("a(sii)"));
     count = list_sys_requests_internal(builder);
     if (count>0) {
         list = g_variant_builder_end(builder);
     }
     else {
         g_variant_builder_clear(builder);
-        list = g_variant_new_array(G_VARIANT_TYPE("(si)"), NULL, 0);
+        list = g_variant_new_array(G_VARIANT_TYPE("(sii)"), NULL, 0);
     }
     tuple = g_variant_new_tuple(&list,1);
     g_dbus_method_invocation_return_value(invocation, tuple);

=== modified file 'testclient/testclient.c'
--- testclient/testclient.c	2013-05-21 21:45:44 +0000
+++ testclient/testclient.c	2013-05-21 23:44:26 +0000
@@ -38,6 +38,7 @@
 struct PublicSysRequest {
     const gchar *owner;
     pid_t pid;
+    int state;
 };
 
 static GMainLoop *main_loop = NULL;
@@ -115,12 +116,14 @@
         g_error_free(error);
     }
     else {
-        g_variant_get(ret, "(a(si))", &iter);
+        g_variant_get(ret, "(a(sii))", &iter);
         g_message("Current Sys Requests:");
         while ((item = g_variant_iter_next_value (iter))) {
             g_variant_get_child (item, 0, "s", &psr.owner);
             g_variant_get_child (item, 1, "i", &psr.pid);
-            g_message("    Owner: %s, Pid: %d", psr.owner, psr.pid);
+            g_variant_get_child (item, 2, "i", &psr.state);
+            g_message("    Owner: %s, Pid: %d, State: %d", psr.owner,
+                psr.pid, psr.state);
             g_array_append_val(retarray, psr);
             g_variant_unref(item);
         }