Merge lp:~laney/ubuntu-system-settings/background-toggle into lp:ubuntu-system-settings

[Iain Lane]

Inline setUpImages(), otherwise the function call doesn't do anything.

Inline setUpImages(), otherwise the function call doesn't do anything.

No, I don't know why this helps. QML :(

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:731
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~laney/ubuntu-system-settings/background-toggle/+merge/222298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/864/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/662
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1353
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1353/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/589
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/801
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/801/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good, i tested on mako and confirmed a background selected from the gallery does show on the greeter.

review: Approve

=== modified file 'plugins/background/MainPage.qml'
--- plugins/background/MainPage.qml	2014-02-18 14:18:27 +0000
+++ plugins/background/MainPage.qml	2014-06-06 09:37:21 +0000
@@ -248,30 +248,28 @@
     }
 
     function setUpImages() {
-        var mostRecent = (systemSettingsSettings.backgroundSetLast === "home") ?
-                    testHomeImage : testWelcomeImage;
-        var leastRecent = (mostRecent === testHomeImage) ?
-                    testWelcomeImage : testHomeImage;
-
-        if (systemSettingsSettings.backgroundDuplicate) { //same
-            /* save value of least recently changed to restore later */
-            systemSettingsSettings.backgroundPreviouslySetValue =
-                    leastRecent.source;
-            /* copy most recently changed to least recently changed */
-            leastRecent.update(mostRecent.source);
-        } else { // different
-            /* restore least recently changed to previous value */
-            leastRecent.update(
-                    systemSettingsSettings.backgroundPreviouslySetValue);
-        }
     }
 
     GSettings {
         id: systemSettingsSettings
         schema.id: "com.ubuntu.touch.system-settings"
         onChanged: {
-            if (key == "backgroundDuplicate")
-                setUpImages();
+            if (key == "backgroundDuplicate") {
+                var mostRecent = (backgroundSetLast === "home")
+                    ? testHomeImage : testWelcomeImage;
+                var leastRecent = (mostRecent === testHomeImage) ?
+                    testWelcomeImage : testHomeImage;
+
+                if (backgroundDuplicate) { //same
+                    /* save value of least recently changed to restore later */
+                    backgroundPreviouslySetValue = leastRecent.source;
+                    /* copy most recently changed to least recently changed */
+                    leastRecent.update(mostRecent.source);
+                } else { // different
+                    /* restore least recently changed to previous value */
+                    leastRecent.update(backgroundPreviouslySetValue);
+                }
+            }
         }
         Component.onCompleted: {
             if (systemSettingsSettings.backgroundDuplicate)