Unity

Merge lp:~azzar1/unity/lp-1363534 into lp:unity

  1. lp-1363534
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3873
Proposed branch: lp:~azzar1/unity/lp-1363534
Merge into: lp:unity
Diff against target: 19 lines (+2/-2)
1 file modified
shortcuts/CompizShortcutModeller.cpp (+2/-2)
To merge this branch: bzr merge lp:~azzar1/unity/lp-1363534
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+234158@code.launchpad.net

Commit message

Use COMPIZ_METAKEY where needed.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3872
http://jenkins.qa.ubuntu.com/job/unity-ci/1084/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/171

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1084/rebuild

review: Approve (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shortcuts/CompizShortcutModeller.cpp'
2--- shortcuts/CompizShortcutModeller.cpp 2014-03-04 18:35:10 +0000
3+++ shortcuts/CompizShortcutModeller.cpp 2014-09-10 17:24:51 +0000
4@@ -283,13 +283,13 @@
5
6 hints.push_back(std::make_shared<shortcut::Hint>(workspaces, "", _(" + Arrow Keys"),
7 _("Switches workspaces."),
8- shortcut::OptionType::COMPIZ_KEY,
9+ shortcut::OptionType::COMPIZ_METAKEY,
10 WALL_PLUGIN_NAME,
11 WALL_OPTION_LEFT_KEY));
12
13 hints.push_back(std::make_shared<shortcut::Hint>(workspaces, "", _(" + Arrow Keys"),
14 _("Moves focused window to another workspace."),
15- shortcut::OptionType::COMPIZ_KEY,
16+ shortcut::OptionType::COMPIZ_METAKEY,
17 WALL_PLUGIN_NAME,
18 WALL_OPTION_LEFT_WINDOW_KEY));
19 }