ubuntu-keyboard

Merge lp:~attente/ubuntu-keyboard/spell-checking-settings into lp:ubuntu-keyboard

  1. spell-checking-settings
  2. Merge into trunk
Proposed by William Hua
Status: Merged
Approved by: Bill Filler
Approved revision: 49
Merged at revision: 53
Proposed branch: lp:~attente/ubuntu-keyboard/spell-checking-settings
Merge into: lp:ubuntu-keyboard
Diff against target: 19 lines (+10/-0)
1 file modified
data/schemas/com.canonical.keyboard.maliit.gschema.xml (+10/-0)
To merge this branch: bzr merge lp:~attente/ubuntu-keyboard/spell-checking-settings
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+187832@code.launchpad.net

Commit message

Re-add the schema that was removed in r45, and append spell-checking settings.

Description of the change

Re-add the schema that was removed in r45, and append spell-checking settings.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/101
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/101

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-keyboard-ci/101/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

sorry william all the previous changes (including the schema) have now been reverted to trunk. can you please resubmit this MR with just the new key added?

review: Needs Fixing
lp:~attente/ubuntu-keyboard/spell-checking-settings updated
49. By William Hua

Merge trunk.

Revision history for this message
William Hua (attente) wrote :

Thanks Bill!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/103/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/103
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/103/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/103

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-keyboard-ci/103/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/schemas/com.canonical.keyboard.maliit.gschema.xml'
2--- data/schemas/com.canonical.keyboard.maliit.gschema.xml 2013-09-26 16:02:12 +0000
3+++ data/schemas/com.canonical.keyboard.maliit.gschema.xml 2013-09-27 03:34:55 +0000
4@@ -26,5 +26,15 @@
5 <description>Vibrate or emit sound on key press.</description>
6 <default>true</default>
7 </key>
8+ <key name="spell-checking" type="b">
9+ <summary>Spell checking</summary>
10+ <description>Check spelling of entered text.</description>
11+ <default>true</default>
12+ </key>
13+ <key name="spell-checking-languages" type="as">
14+ <summary>Spell checking languages</summary>
15+ <description>User-defined list of activatable spell-checking languages.</description>
16+ <default>[]</default>
17+ </key>
18 </schema>
19 </schemalist>

Subscribers

People subscribed via source and target branches