Merge lp:~laney/ubuntu-system-settings/up-from-panels into lp:ubuntu-system-settings

[Iain Lane]

Always push the main page onto the pageStack so that we can go back to the index after being launched to an individual panel.

Always push the main page onto the pageStack so that we can go back to the index after being launched to an individual panel.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:436
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/445/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/ubuntu-system-settings-saucy-amd64-ci/445

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/445/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'src/qml/MainWindow.qml'
--- src/qml/MainWindow.qml	2013-10-02 13:55:02 +0000
+++ src/qml/MainWindow.qml	2013-10-07 17:24:23 +0000
@@ -31,6 +31,7 @@
 
     Component.onCompleted: {
         i18n.domain = "ubuntu-system-settings"
+        pageStack.push(mainPage)
         if (defaultPlugin) {
             var plugin = pluginManager.getByName(defaultPlugin)
             if (plugin) {
@@ -43,8 +44,6 @@
                 console.log("Plugin " + defaultPlugin + " does not exist.")
                 Qt.quit()
             }
-        } else {
-            pageStack.push(mainPage)
         }
     }