The Sound Menu

Merge lp:~ted/indicator-sound/phone-greeter-mute into lp:indicator-sound/14.04

  1. phone-greeter-mute
  2. Merge into trunk.14.04
Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 437
Merged at revision: 439
Proposed branch: lp:~ted/indicator-sound/phone-greeter-mute
Merge into: lp:indicator-sound/14.04
Prerequisite: lp:~ted/indicator-sound/test-failures
Diff against target: 11 lines (+1/-1)
1 file modified
src/service.vala (+1/-1)
To merge this branch: bzr merge lp:~ted/indicator-sound/phone-greeter-mute
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Terry Approve
Review via email: mp+212924@code.launchpad.net

This proposal supersedes a proposal from 2014-03-25.

Commit message

Remove mute from the phone greeter

Description of the change

Make it look like the phone itself

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote : Posted in a previous version of this proposal

Looks sensible.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/126/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/66/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/65/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/126/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Terry (mterry) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:437
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/127/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/66
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/66/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/127/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/service.vala'
--- src/service.vala 2014-03-21 19:34:52 +0000
+++ src/service.vala 2014-03-26 18:48:51 +0000
@@ -39,7 +39,7 @@
3939
40 this.menus = new HashTable<string, SoundMenu> (str_hash, str_equal);40 this.menus = new HashTable<string, SoundMenu> (str_hash, str_equal);
41 this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS));41 this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS));
42 this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));42 this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
43 this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE));43 this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE));
44 this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));44 this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
4545

Subscribers

People subscribed via source and target branches