Merge lp:~ken-vandine/powerd/lp1186706 into lp:powerd

[Ken VanDine]

Don't listen for proximity events if prox_sensor is NULL (LP: #1186706)

Don't listen for proximity events if prox_sensor is NULL (LP: #1186706)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/powerd-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-raring-armhf-ci/46

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

review: Approve (continuous-integration)

=== modified file 'src/powerd-sensors.cpp'
--- src/powerd-sensors.cpp	2013-05-29 21:06:00 +0000
+++ src/powerd-sensors.cpp	2013-06-03 18:27:24 +0000
@@ -57,7 +57,9 @@
 {
     prox_sensor = ua_sensors_proximity_new();
 
-    ua_sensors_proximity_set_reading_cb(prox_sensor,
-                                        on_new_proximity_event,
-                                        NULL);
+    if (prox_sensor != NULL) {
+        ua_sensors_proximity_set_reading_cb(prox_sensor,
+                                            on_new_proximity_event,
+                                            NULL);
+    }
 }