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

[William Hua]

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

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

[PS Jenkins bot (ps-jenkins)]

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)

[Bill Filler (bfiller)]

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]

49. By William Hua on 2013-09-27

Merge trunk.

[William Hua (attente)]

Thanks Bill!

[PS Jenkins bot (ps-jenkins)]

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)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'data/schemas/com.canonical.keyboard.maliit.gschema.xml'
--- data/schemas/com.canonical.keyboard.maliit.gschema.xml	2013-09-26 16:02:12 +0000
+++ data/schemas/com.canonical.keyboard.maliit.gschema.xml	2013-09-27 03:34:55 +0000
@@ -26,5 +26,15 @@
       <description>Vibrate or emit sound on key press.</description>
       <default>true</default>
     </key>
+    <key name="spell-checking" type="b">
+      <summary>Spell checking</summary>
+      <description>Check spelling of entered text.</description>
+      <default>true</default>
+    </key>
+    <key name="spell-checking-languages" type="as">
+      <summary>Spell checking languages</summary>
+      <description>User-defined list of activatable spell-checking languages.</description>
+      <default>[]</default>
+    </key>
   </schema>
 </schemalist>