Merge lp:~nick-dedekind/unity8/indicators.network.password into lp:unity8

[Nick Dedekind]

Fixed network indicator password dialog not appearing.

Fixed network indicator password dialog not appearing.

[lp:~nick-dedekind/unity8/indicators.network.password]

207. By Nick Dedekind on 2013-08-16

Fixed network indicator password dialog

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:207
http://jenkins.qa.ubuntu.com/job/unity8-ci/650/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2304/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1123/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/651/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/650/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2310/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/650/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Panel/Indicators/NetworkIndicatorPage.qml'
--- Panel/Indicators/NetworkIndicatorPage.qml	2013-08-14 13:20:41 +0000
+++ Panel/Indicators/NetworkIndicatorPage.qml	2013-08-16 10:47:49 +0000
@@ -23,7 +23,7 @@
 import Ubuntu.Components 0.1
 
 PageStack {
-    id: network
+    id: networkPage
     // Stops the search for a parent tree node.
     // We don't want it going up to the indicator tabs.
     // FIXME: need a better way of doing this.
@@ -60,7 +60,7 @@
         id: networkAgent
 
         onSecretRequested: {
-            _network.push(passwordPageComponent, {"token": token});
+            networkPage.push(passwordPageComponent, {"token": token});
         }
     }