Merge lp:~ken-vandine/ubuntu-system-settings/rtm-brightness_crash into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

[brightness] ensure properties are not use undefined

[brightness] ensure properties are not use undefined

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:942
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/10/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/9/rebuild

review: Approve (continuous-integration)

[Jonas G. Drange (jonas-drange)]

LGTM

review: Approve

=== modified file 'plugins/brightness/brightness.cpp'
--- plugins/brightness/brightness.cpp	2014-07-23 13:44:31 +0000
+++ plugins/brightness/brightness.cpp	2014-12-09 18:58:59 +0000
@@ -23,6 +23,7 @@
 #include <QDBusArgument>
 #include <QDBusReply>
 #include <QDBusMetaType>
+#include <QDebug>
 
 // Returned data from getBrightnessParams
 struct BrightnessParams {
@@ -58,13 +59,17 @@
     m_powerdIface ("com.canonical.powerd",
                    "/com/canonical/powerd",
                    "com.canonical.powerd",
-                   m_systemBusConnection)
+                   m_systemBusConnection),
+    m_powerdRunning(false),
+    m_autoBrightnessAvailable(false)
 {
     qRegisterMetaType<BrightnessParams>();
     m_powerdRunning = m_powerdIface.isValid();
 
-    if (!m_powerdRunning)
+    if (!m_powerdRunning) {
+        qWarning() << m_powerdIface.interface() << m_powerdIface.lastError().message();
         return;
+    }
 
     QDBusMessage reply(m_powerdIface.call("getBrightnessParams"));