Merge lp:~attente/ubuntu-system-settings/1263163 into lp:ubuntu-system-settings

[William Hua]

[language] Disable confirm if unchanged.

[language] Disable confirm if unchanged.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:553
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/577/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/81
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/80

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

review: Approve (continuous-integration)

[Iain Lane (laney)]

Looks neat, thanks

review: Approve

=== modified file 'plugins/language/DisplayLanguage.qml'
--- plugins/language/DisplayLanguage.qml	2013-10-11 06:03:15 +0000
+++ plugins/language/DisplayLanguage.qml	2014-01-09 17:23:55 +0000
@@ -109,6 +109,7 @@
             id: confirmButton
 
             text: i18n.tr("Confirm")
+            enabled: languageList.currentIndex != plugin.currentLanguage
 
             anchors.left: parent.horizontalCenter
             anchors.right: parent.right

=== modified file 'plugins/language/SubsetView.qml'
--- plugins/language/SubsetView.qml	2013-10-01 10:19:17 +0000
+++ plugins/language/SubsetView.qml	2014-01-09 17:23:55 +0000
@@ -57,7 +57,6 @@
             }
         }
         enabled: model.enabled
-
     }
 
     add: Transition {