Merge lp://qastaging/~mterry/lightdm/keyboards into lp://qastaging/lightdm
Proposed by
Michael Terry
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 1394 | ||||||||||||
| Proposed branch: | lp://qastaging/~mterry/lightdm/keyboards | ||||||||||||
| Merge into: | lp://qastaging/lightdm | ||||||||||||
| Diff against target: |
962 lines (+607/-26) (has conflicts) 15 files modified
liblightdm-gobject/layout.c (+88/-11) liblightdm-gobject/user.c (+10/-1) tests/Makefile.am (+2/-0) tests/scripts/default-keyboard-layout.conf (+40/-0) tests/scripts/keyboard-layout.conf (+11/-0) tests/scripts/keyboard-variants.conf (+52/-0) tests/scripts/no-keyboard-layout.conf (+4/-0) tests/src/Makefile.am (+1/-1) tests/src/X.c (+3/-0) tests/src/test-gobject-greeter.c (+92/-0) tests/src/test-runner.c (+27/-12) tests/src/x-server.c (+271/-1) tests/src/x-server.h (+2/-0) tests/test-default-keyboard-layout (+2/-0) tests/test-keyboard-variants (+2/-0) Text conflict in tests/scripts/keyboard-layout.conf Text conflict in tests/scripts/no-keyboard-layout.conf Text conflict in tests/src/test-gobject-greeter.c |
||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~mterry/lightdm/keyboards | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Robert Ancell | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
This branch fixes the outstanding keyboard issues:
1) It grabs the default keyboard layout from the system
2) It lists variants in its giant list of layouts
3) It knows to ask accountsservice about "XKeyboardLayout" a new property I will add to accountsservice to expose the user's layout/variant. The X in this instance means "extension", i.e. not official.
And of course, new or augmented tests for all this.
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
Seems to be some merge conflicts (see script files)?
Apart from that looks great, loving the regression test work. :)