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

[Ken VanDine]

Pass some args when pushing the online-accounts panel page

Pass some args when pushing the online-accounts panel page

[lp:~ken-vandine/ubuntu-system-settings/app_permissions_online_accounts]

1522. By Ken VanDine on 2015-09-09

Rename variables to make more sense for online accounts

[Alberto Mardegan (mardy)]

LGTM, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1521
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2387/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4085
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/571
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3337
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4082
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4082/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23174

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/security-privacy/AppAccess.qml'
--- plugins/security-privacy/AppAccess.qml	2015-09-09 15:03:50 +0000
+++ plugins/security-privacy/AppAccess.qml	2015-09-09 15:03:50 +0000
@@ -97,11 +97,11 @@
                     text: i18n.tr("Online Accounts…")
                     width: parent.width - units.gu(4)
                     onClicked: {
-                        var upPlugin = pluginManager.getByName("online-accounts")
-                        if (upPlugin) {
-                            var updatePage = upPlugin.pageComponent
-                            if (updatePage)
-                                pageStack.push(updatePage)
+                        var oaPlugin = pluginManager.getByName("online-accounts")
+                        if (oaPlugin) {
+                            var accountsPage = oaPlugin.pageComponent
+                            if (accountsPage)
+                                pageStack.push(accountsPage, {plugin: oaPlugin, pluginManager: pluginManager})
                             else
                                 console.warn("online-accounts")
                         } else {