Merge lp:~jonas-drange/ubuntu-system-settings/lp1617217 into lp:ubuntu-system-settings

[Jonas G. Drange]

fixes two crashes in About -> Check for update and Battery -> Brightness

[lp:~jonas-drange/ubuntu-system-settings/lp1617217]

1708. By Jonas G. Drange on 2016-08-31

apply same fix for battery panel

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1707
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/139/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1381/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1381
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1240
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1240
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1240
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1236
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1236/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1236/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1236/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1236
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1236/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1236
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1236/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1236
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1236/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1236
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1236/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1236
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1236/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1236
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1236/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/139/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1708
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/140/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1384/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1384
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1244
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1244
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1244
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1240
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1240/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1240/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1240/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1240
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1240/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1240
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1240/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1240
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1240/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1240
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1240/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1240
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1240/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1240
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1240/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/140/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

These test failures are not introduced by this branch.

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2016-08-12 12:15:26 +0000
+++ plugins/about/PageComponent.qml	2016-08-31 14:19:25 +0000
@@ -194,7 +194,9 @@
                             var updatePage = upPlugin.pageComponent
                             var updatePageItem;
                             if (updatePage) {
-                                updatePageItem = pageStack.push(updatePage);
+                                updatePageItem = pageStack.push(updatePage, {
+                                    plugin: upPlugin, pluginManager: pluginManager
+                                });
                                 updatePageItem.check(true); // Force a check.
                             } else {
                                 console.warn("Failed to get system-update pageComponent")

=== modified file 'plugins/battery/PageComponent.qml'
--- plugins/battery/PageComponent.qml	2016-07-14 13:51:56 +0000
+++ plugins/battery/PageComponent.qml	2016-08-31 14:19:25 +0000
@@ -294,8 +294,16 @@
 
             SettingsListItems.StandardProgression {
                 text: i18n.tr("Display brightness")
-                onClicked: pageStack.push(
-                               pluginManager.getByName("brightness").pageComponent)
+                onClicked: {
+                    var brightnessPlugin = pluginManager.getByName("brightness");
+                    if (brightnessPlugin) {
+                        pageStack.push(brightnessPlugin.pageComponent, {
+                            plugin: brightnessPlugin, pluginManager: pluginManager
+                        });
+                    } else {
+                        console.warn("Failed to get brightness plugin instance");
+                    }
+                }
             }
 
             SettingsListItems.SingleValueProgression {