Merge lp:~charlesk/indicator-datetime/lp-1384714-silence-wakeup-warning into lp:indicator-datetime/15.04

[Charles Kerr]

Don't log an error if powerd isn't available on the system.

Don't log an error if powerd isn't available on the system: we don't need it for desktop, which is where this error message is getting logged, so it's okay to fail silently.

[Ted Gould (ted)]

I think we need a comment on why that error is being ignored in the source code.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:389
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/285/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/59/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/285/rebuild

review: Approve (continuous-integration)

[lp:~charlesk/indicator-datetime/lp-1384714-silence-wakeup-warning]

390. By Charles Kerr on 2014-11-04

add a comment explaining why it's okay to let that fail silently.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:390
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/286/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/60/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/286/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/wakeup-timer-powerd.cpp'
--- src/wakeup-timer-powerd.cpp	2014-09-19 14:34:50 +0000
+++ src/wakeup-timer-powerd.cpp	2014-11-04 18:27:51 +0000
@@ -192,8 +192,13 @@
         ret = g_dbus_connection_call_finish(G_DBUS_CONNECTION(o), res, &error);
         if (ret == nullptr)
         {
-            if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+            /* powerd isn't on the desktop, but we don't need hardware wakeups there
+               anyway... so no need to warn on SERVICE_UNKNOWN */
+            if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
+                !g_error_matches(error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN))
+            {
                 g_warning("%s Could not set hardware wakeup: %s", G_STRLOC, error->message);
+            }
         }
         else
         {