Merge lp:~seb128/ubuntu-system-settings/sound-keyboard-backend into lp:ubuntu-system-settings

[Sebastien Bacher]

[sound] use the correct backend to control the keyboard sound toggle

[sound] use the correct backend to control the keyboard sound toggle

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1020
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1441/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/633
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5928
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5928/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13008
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2852
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3754
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3754/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1441/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Works great

review: Approve

=== modified file 'plugins/sound/PageComponent.qml'
--- plugins/sound/PageComponent.qml	2014-08-28 17:33:40 +0000
+++ plugins/sound/PageComponent.qml	2014-09-10 09:50:01 +0000
@@ -23,7 +23,6 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import SystemSettings 1.0
-import Ubuntu.SystemSettings.LanguagePlugin 1.0
 import Ubuntu.SystemSettings.Sound 1.0
 import Ubuntu.Settings.Menus 0.1 as Menus
 import QMenuModel 0.1
@@ -40,8 +39,10 @@
 
     UbuntuSoundPanel { id: backendInfo }
 
-    UbuntuLanguagePlugin {
-        id: languagePlugin
+    GSettings {
+        id: keyboardSettings
+
+        schema.id: "com.canonical.keyboard.maliit"
     }
 
     GSettings {
@@ -196,9 +197,9 @@
 
                 control: Switch {
                     objectName: "keyboardSoundSwitch"
-                    checked: languagePlugin.keyPressFeedback
+                    checked: keyboardSettings.keyPressFeedback
 
-                    onClicked: languagePlugin.keyPressFeedback = checked
+                    onClicked: keyboardSettings.keyPressFeedback = checked
                 }
             }