Unity

Merge lp://qastaging/~azzar1/unity/fix-939517 into lp://qastaging/unity

  1. fix-939517
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 2100
Proposed branch: lp://qastaging/~azzar1/unity/fix-939517
Merge into: lp://qastaging/unity
Diff against target: 130 lines (+51/-2)
7 files modified
plugins/unityshell/src/AbstractShortcutHint.h (+1/-0)
plugins/unityshell/src/MockShortcutHint.h (+1/-0)
plugins/unityshell/src/ShortcutHint.cpp (+29/-0)
plugins/unityshell/src/ShortcutHintPrivate.cpp (+9/-0)
plugins/unityshell/src/ShortcutHintPrivate.h (+1/-0)
plugins/unityshell/src/unityshell.cpp (+2/-2)
tests/test_shortcut_private.cpp (+8/-0)
To merge this branch: bzr merge lp://qastaging/~azzar1/unity/fix-939517
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Review via email: mp+94947@code.qastaging.launchpad.net

Commit message

= The Problem =

The shortcut overlay uses hardcoded value for switching ws.

= The Fix =

Add a new type of shortcut option COMPIZ_METAKEY_OPTION.

= Testing =

Added.

To post a comment you must log in.
Revision history for this message
Mirco Müller (macslow) wrote :

Code looks ok, unity compiles and runs, test is provided and passes... approved.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/429/console reported an error when processing this lp:~andyrock/unity/fix-939517 branch.
Not merging it.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/450/console reported an error when processing this lp:~andyrock/unity/fix-939517 branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.