Merge lp://staging/~julien-spautz/switchboard-plug-keyboard/forbidden-keybindings into lp://staging/~elementary-pantheon/switchboard-plug-keyboard/trunk
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Cody Garver | ||||
| Approved revision: | 135 | ||||
| Merged at revision: | 372 | ||||
| Proposed branch: | lp://staging/~julien-spautz/switchboard-plug-keyboard/forbidden-keybindings | ||||
| Merge into: | lp://staging/~elementary-pantheon/switchboard-plug-keyboard/trunk | ||||
| Diff against target: |
40 lines (+15/-3) 1 file modified
src/Pages/Shortcuts/shortcut.vala (+15/-3) |
||||
| To merge this branch: | bzr merge lp://staging/~julien-spautz/switchboard-plug-keyboard/forbidden-keybindings | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| elementary Pantheon team | Pending | ||
|
Review via email:
|
|||
Commit message
fixes bug #1221515: shortcuts can override normal keyboard input
Changes:
- shortcuts must always have a modifier
- added some more exceptions to shift modifier (using the original gcc panel as reference)
This might not cover all possible shortcuts that also have a function on their own, but it fixes the case described in the bug report. If you find any other cases or even a standard/
GCC code: https:/
Description of the change
fixes bug #1221515: shortcuts can override normal keyboard input
Changes:
- shortcuts must always have a modifier
- added some more exceptions to shift modifier (using the original gcc panel as reference)
This might not cover all possible shortcuts that also have a function on their own, but it fixes the case described in the bug report. If you find any other cases or even a standard/
GCC code: https:/
