powerd

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

  1. ignore-input-when-screen-is-off
  2. Merge into trunk
Proposed by Seth Forshee
Status: Merged
Approved by: Oliver Grawert
Approved revision: 96
Merged at revision: 98
Proposed branch: lp:~sforshee/powerd/ignore-input-when-screen-is-off
Merge into: lp:powerd
Diff against target: 13 lines (+2/-1)
1 file modified
src/powerd.cpp (+2/-1)
To merge this branch: bzr merge lp:~sforshee/powerd/ignore-input-when-screen-is-off
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Matt Fischer (community) Approve
Review via email: mp+189417@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Matt Fischer (mfisch) wrote :

Looks simple +1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/powerd.cpp'
2--- src/powerd.cpp 2013-09-30 17:06:12 +0000
3+++ src/powerd.cpp 2013-10-04 19:37:15 +0000
4@@ -188,7 +188,8 @@
5 }
6 break;
7 default:
8- powerd_reset_activity_timer(1);
9+ if (powerd_display_enabled())
10+ powerd_reset_activity_timer(1);
11 break;
12 }
13 }

Subscribers

People subscribed via source and target branches