Merge lp:~sforshee/powerd/improve-state-machine-error-handling into lp:powerd

[Seth Forshee]

Improve error handling in system power state change state machine

Improve error handling in system power state change state machine

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/powerd-ci/103/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/57/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/power-request.c'
--- src/power-request.c	2013-07-29 16:05:34 +0000
+++ src/power-request.c	2013-08-05 09:00:40 +0000
@@ -468,7 +468,7 @@
 
 static void state_transition_process(void)
 {
-    guint delay;
+    guint delay = 0;
 
     state_machine_source_id = 0;
     do {
@@ -483,6 +483,8 @@
             cur_state_transition_state = process_state_complete(&delay);
             break;
         default:
+	    powerd_error("Invalid transition state, setting to idle");
+	    cur_state_transition_state = STATE_TRANSITION_IDLE;
             break;
         }
     } while (delay == 0 &&