diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2016-01-29 15:40:16 +0100 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2016-01-29 15:40:16 +0100 |
| commit | 46f1c75cfbceb69a4f948e935e8661a904b0cf2e (patch) | |
| tree | 5ff44bde7e9ad5125fe97af826b28b0e31f493f1 /src/service.vala | |
| parent | 3df5a15f0c7924214c1ae5fbaa5eca32b5c2cd54 (diff) | |
| parent | 12715ce7e03fec9544d7261c87aa9ddaa39b75ad (diff) | |
| download | ayatana-indicator-sound-46f1c75cfbceb69a4f948e935e8661a904b0cf2e.tar.gz ayatana-indicator-sound-46f1c75cfbceb69a4f948e935e8661a904b0cf2e.tar.bz2 ayatana-indicator-sound-46f1c75cfbceb69a4f948e935e8661a904b0cf2e.zip | |
fixed conflict
Diffstat (limited to 'src/service.vala')
| -rw-r--r-- | src/service.vala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/service.vala b/src/service.vala index 29b8670..2228ba2 100644 --- a/src/service.vala +++ b/src/service.vala @@ -94,7 +94,7 @@ public class IndicatorSound.Service: Object { this.menus = new HashTable<string, SoundMenu> (str_hash, str_equal); this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS)); this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_SILENT_MODE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS)); - this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE)); + this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS_PLAY_CONTROLS)); this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.SHOW_SILENT_MODE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS)); this.menus.@foreach ( (profile, menu) => { |