Unity

Merge lp:~bregma/unity/lp-1363534-trusty into lp:unity/7.2

  1. lp-1363534-trusty
  2. Merge into trusty
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3816
Proposed branch: lp:~bregma/unity/lp-1363534-trusty
Merge into: lp:unity/7.2
Diff against target: 19 lines (+2/-2)
1 file modified
shortcuts/CompizShortcutModeller.cpp (+2/-2)
To merge this branch: bzr merge lp:~bregma/unity/lp-1363534-trusty
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
Review via email: mp+252660@code.launchpad.net

Commit message

Use COMPIZ_METAKEY where needed.

Description of the change

Use COMPIZ_METAKEY where needed.

Cherry-picked from Unity trunk.

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) 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 2015-03-11 21:04:44 +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 }

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: