Merge lp:~larsu/unity8/use-volume-action into lp:unity8

Proposed by Lars Karlitski
Status: Merged
Approved by: Michał Sawicz
Approved revision: 412
Merged at revision: 423
Proposed branch: lp:~larsu/unity8/use-volume-action
Merge into: lp:unity8
Diff against target: 12 lines (+1/-1)
1 file modified
Components/VolumeControl.qml (+1/-1)
To merge this branch: bzr merge lp:~larsu/unity8/use-volume-action
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+190292@code.launchpad.net

Commit message

VolumeControl: use 'volume' instead of 'scroll' action

The volume action doesn't show a notification.

Description of the change

VolumeControl: use 'volume' instead of 'scroll' action, because the volume action doesn't show a notification.

Note: this will only work once lp:~larsu/indicator-sound/volume-action-activation landed.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:412
http://jenkins.qa.ubuntu.com/job/unity8-ci/1344/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4877
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2744
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1344
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1344/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/752
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/752/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2746/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2292

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1344/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Components/VolumeControl.qml'
2--- Components/VolumeControl.qml 2013-09-09 16:49:01 +0000
3+++ Components/VolumeControl.qml 2013-10-10 03:42:33 +0000
4@@ -28,7 +28,7 @@
5 busName: "com.canonical.indicator.sound"
6 objectPath: "/com/canonical/indicator/sound"
7
8- property variant actionObject: action("scroll")
9+ property variant actionObject: action("volume")
10 }
11
12 function volumeUp() {

Subscribers

People subscribed via source and target branches