Merge lp:~osomon/ubuntu-ui-toolkit/fix-typo-in-panel into lp:ubuntu-ui-toolkit

[Olivier Tilloy]

Fix a typo in Panel.qml.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:726
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/581/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/438
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/438/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2793
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2793/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2364

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/581/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

thanks for fixing it!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/237/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-autolanding/163
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-autolanding/163/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2797
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2797/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2367

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2013-08-21 17:06:42 +0000
+++ modules/Ubuntu/Components/Panel.qml	2013-08-29 11:54:45 +0000
@@ -299,7 +299,7 @@
 
         // Used for recovering the state from before
         //  bottomBarVisibilityCommunicator forced the toolbar to hide.
-        property bool savedlocked: panel.locked
+        property bool savedLocked: panel.locked
         property bool savedOpened: panel.opened
 
         // Convert from Qt.AlignLeading to Qt.AlignTrailing to Qt.AlignLeft and Qt.AlignRight
@@ -335,8 +335,8 @@
                 panel.opened = false;
                 panel.locked = true;
             } else { // don't force hidden
-                panel.locked = internal.savedlocked;
-                if (internal.savedlocked) panel.opened = internal.savedOpened;
+                panel.locked = internal.savedLocked;
+                if (internal.savedLocked) panel.opened = internal.savedOpened;
                 // if the panel was locked, do not slide it back in
                 // until the user performs an edge swipe.
             }