Merge lp://qastaging/~didrocks/unity/misc-launcher-fixes into lp://qastaging/unity
Proposed by
Didier Roche-Tolomelli
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 900 | ||||||||
| Proposed branch: | lp://qastaging/~didrocks/unity/misc-launcher-fixes | ||||||||
| Merge into: | lp://qastaging/unity | ||||||||
| Diff against target: |
218 lines (+57/-33) 4 files modified
src/Launcher.cpp (+40/-20) src/Launcher.h (+2/-2) src/LauncherController.cpp (+7/-8) src/unityshell.cpp (+8/-3) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~didrocks/unity/misc-launcher-fixes | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jason Smith (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2011-02-28.
Description of the change
This branch clean some hardcoded duplicated values and simplify the super key
code. Also, now Super + Shift != Super for keynum:
Super + keynum -> activate existing instances (ignore Shift modifier in some
weird keyboard layout like French ones :))
Super + Shift + keynum -> open a new instance
It also merge some fixes on alt + F1 from Oliver's that I retouched slightly
It's still hackish on the keynav stuff, some refactoring will be needed.
Also there are some crash fixes, like invalid CompWindow lost in track
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1 looks good, line 56 of review has random space after !
also
if ()
{
foo ()
}
else
bar ()
is not okay. {} around all statement or none, don't mix and match. Just fix these two on merge :)