Merge lp:~azzar1/unity/ignore-autorepeat-actions into lp:unity

Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4110
Proposed branch: lp:~azzar1/unity/ignore-autorepeat-actions
Merge into: lp:unity
Diff against target: 17 lines (+5/-2)
1 file modified
unity-shared/GnomeKeyGrabber.cpp (+5/-2)
To merge this branch: bzr merge lp:~azzar1/unity/ignore-autorepeat-actions
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+292894@code.launchpad.net

Commit message

GnomeKeyGrabber: do not activate an action if it's a repeated one.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'unity-shared/GnomeKeyGrabber.cpp'
--- unity-shared/GnomeKeyGrabber.cpp 2015-12-13 10:35:58 +0000
+++ unity-shared/GnomeKeyGrabber.cpp 2016-04-26 09:53:34 +0000
@@ -232,8 +232,11 @@
232 {232 {
233 action.setState(CompAction::StateInitKey);233 action.setState(CompAction::StateInitKey);
234 action.setInitiate([this, action_id](CompAction* action, CompAction::State state, CompOption::Vector& options) {234 action.setInitiate([this, action_id](CompAction* action, CompAction::State state, CompOption::Vector& options) {
235 LOG_DEBUG(logger) << "pressed \"" << action->keyToString() << "\"";235 if (!CompOption::getBoolOptionNamed(options, "is_repeated"))
236 ActivateDBusAction(*action, action_id, 0, CompOption::getIntOptionNamed(options, "time"));236 {
237 LOG_DEBUG(logger) << "pressed \"" << action->keyToString() << "\"";
238 ActivateDBusAction(*action, action_id, 0, CompOption::getIntOptionNamed(options, "time"));
239 }
237 return true;240 return true;
238 });241 });
239 }242 }