Merge lp:~larsu/unity8/lp1219057 into lp:unity8

[Lars Karlitski]

VolumeControl: use action of the new indicator

indicator-sound recently gained an action to increase and decrease the volume. This patch makes use of that to get rid of a bus round trip (to get the current volume) and a race (when the volume gets set between fetching the current volume and setting the new volume).

VolumeControl: use action of the new indicator

indicator-sound recently gained an action to increase and decrease the volume. This patch makes use of that to get rid of a bus round trip (to get the current volume) and a race (when the volume gets set between fetching the current volume and setting the new volume).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
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/~larsu/unity8/lp1219057/+merge/184622/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/951/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3194
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/952
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/952/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/951
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3200
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3200/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/754
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/754/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/621
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/632

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
http://jenkins.qa.ubuntu.com/job/unity8-ci/957/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/770
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1624
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/958
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/958/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3233
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3233/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2719
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/772
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/772/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/648

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
http://jenkins.qa.ubuntu.com/job/unity8-ci/958/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/771
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1625
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/959
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/959/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/958
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3234
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3234/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/773
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/773/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/649

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
http://jenkins.qa.ubuntu.com/job/unity8-ci/979/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3293
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/833/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/980
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/980/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/979
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3299
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3299/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2783
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/835/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Yup, this works.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/444/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1012
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1716/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/445
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/445/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3496
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3496/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1014
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1014/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/851
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/863

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/446/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2234
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3499
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1027
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1720
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/30/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/448
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/448/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/449/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3511
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3511/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2963
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1029
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1029/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/862
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/874

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/448/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3523/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1051
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/452
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/452/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/453
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3535
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3535/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2985/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1053
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1053/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/881
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/893

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Components/VolumeControl.qml'
--- Components/VolumeControl.qml	2013-06-05 22:03:08 +0000
+++ Components/VolumeControl.qml	2013-09-09 17:00:47 +0000
@@ -21,37 +21,22 @@
     id: root
     objectName: "volumeControl"
     visible: false
-    property int volume
 
     QDBusActionGroup {
         id: actionGroup
         busType: 1
-        busName: "com.canonical.settings.sound"
-        objectPath: "/com/canonical/settings/sound"
-
-        property variant actionObject: action("volume")
-        property variant serverVolume: actionObject.valid ? actionObject.state: 0
-    }
-
-    Binding {
-        target: root
-        property: "volume"
-        value: actionGroup.serverVolume * 100
-    }
-
-    onVolumeChanged: {
-        if (actionGroup.serverVolume != volume) {
-            var targetVolume = Math.min(1, Math.max(0, volume / 100));
-            actionGroup.actionObject.updateState(targetVolume);
-        }
+        busName: "com.canonical.indicator.sound"
+        objectPath: "/com/canonical/indicator/sound"
+
+        property variant actionObject: action("scroll")
     }
 
     function volumeUp() {
-        actionGroup.actionObject.updateState(Math.min(1, volume/100 + 0.10));
+        actionGroup.actionObject.activate(1);
     }
 
     function volumeDown() {
-        actionGroup.actionObject.updateState(Math.max(0, volume/100 - 0.10));
+        actionGroup.actionObject.activate(-1);
     }
 
     Component.onCompleted: actionGroup.start()