Merge lp:~sforshee/powerd/ignore-input-when-screen-is-off into lp:powerd

[Seth Forshee]

Don't reset the activity timer for touch events if the screen is of (LP: #1234743)

Don't reset the activity timer for touch events if the screen is of (LP: #1234743)

[Matt Fischer (mfisch)]

Looks simple +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2013-09-30 17:06:12 +0000
+++ src/powerd.cpp	2013-10-04 19:37:15 +0000
@@ -188,7 +188,8 @@
             }
             break;
         default:
-            powerd_reset_activity_timer(1);
+            if (powerd_display_enabled())
+                powerd_reset_activity_timer(1);
             break;
     }
 }