Merge lp:~jonas-drange/ubuntu-system-settings-online-accounts/lp1445350 into lp:ubuntu-system-settings-online-accounts

[Jonas G. Drange]

pressed will refer to the AbstractButton's MouseArea.pressed, so rename the property to avoid the conflict

pressed will refer to the AbstractButton's MouseArea.pressed, so rename the property to avoid the conflict

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:296
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/250/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/703
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/38
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/703
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/703/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23569

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

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

LGTM, thanks!

review: Approve

=== modified file 'system-settings-plugin/ProvidersList.qml'
--- system-settings-plugin/ProvidersList.qml	2014-09-30 12:29:26 +0000
+++ system-settings-plugin/ProvidersList.qml	2015-09-22 12:39:26 +0000
@@ -38,19 +38,24 @@
         model: providerModel
 
         delegate: ListItem.Standard {
+            id: provider
             text: displayName
             enabled: accountModel === null || accountModel.count === 0
             iconSource: model.iconName.indexOf("/") === 0 ?
                 model.iconName : "image://theme/" + model.iconName
             progression: false
-            onClicked: { pressed = true; root.providerClicked(providerId) }
+            onTriggered: {
+                activated = true;
+                root.providerClicked(providerId);
+            }
             property var accountModel: isSingleAccount ? createAccountModel(providerId) : null
+            property bool activated: false
 
             ActivityIndicator {
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.right: parent.right
                 anchors.rightMargin: units.gu(2)
-                running: pressed
+                running: provider.activated
             }
 
             function createAccountModel(providerId) {
@@ -70,7 +75,7 @@
 
     function clearPressedButtons() {
         for (var i = 0; i < repeater.count; i++) {
-            repeater.itemAt(i).pressed = false
+            repeater.itemAt(i).activated = false
         }
     }
 }