Merge lp:~ken-vandine/ubuntu-system-settings/drop_default_string_hack into lp:ubuntu-system-settings

[Ken VanDine]

Dropped workaround for lack of default value for MousePrimaryButton and TouchpadPrimaryButton.

Dropped workaround for lack of default value for MousePrimaryButton and TouchpadPrimaryButton. This was fixed in https://code.launchpad.net/~mterry/gsettings-ubuntu-touch-schemas/fix-strings/+merge/291019

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1632
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2668/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6798/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/851
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5151/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6809
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6809/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28058

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/mouse/Connected.qml'
--- plugins/mouse/Connected.qml	2016-03-11 03:12:58 +0000
+++ plugins/mouse/Connected.qml	2016-04-05 17:33:44 +0000
@@ -196,8 +196,7 @@
                 right: parent.right
             }
             height: childrenRect.height + units.gu(2)
-            // Workaround an issue in AccountsService not returning default for string
-            selected: backend.mousePrimaryButton ? backend.mousePrimaryButton : "left"
+            selected: backend.mousePrimaryButton
             onSelectedChanged: {
                 backend.mousePrimaryButton = selected;
             }
@@ -369,8 +368,7 @@
                 right: parent.right
             }
             height: childrenRect.height + units.gu(1)
-            // Workaround an issue in AccountsService not returning default for string
-            selected: backend.touchpadPrimaryButton ?  backend.touchpadPrimaryButton : "left"
+            selected: backend.touchpadPrimaryButton
             onSelectedChanged: {
                 backend.touchpadPrimaryButton = selected;
             }