diff options
| author | charles kerr <charlesk@canonical.com> | 2015-12-19 21:31:12 -0600 |
|---|---|---|
| committer | charles kerr <charlesk@canonical.com> | 2015-12-19 21:31:12 -0600 |
| commit | af0d715e8a451cac638980c67d1a4be0634a6b79 (patch) | |
| tree | 0894fdc9fb56d4138bf3dba7e9c0ce8c02edfe7c /src/service.vala | |
| parent | 6773fd52378cca6b3b8058923f4262633cc8f71e (diff) | |
| download | ayatana-indicator-sound-af0d715e8a451cac638980c67d1a4be0634a6b79.tar.gz ayatana-indicator-sound-af0d715e8a451cac638980c67d1a4be0634a6b79.tar.bz2 ayatana-indicator-sound-af0d715e8a451cac638980c67d1a4be0634a6b79.zip | |
remove high-volume-approved from volume-control
Diffstat (limited to 'src/service.vala')
| -rw-r--r-- | src/service.vala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/service.vala b/src/service.vala index 55743b5..f03fe19 100644 --- a/src/service.vala +++ b/src/service.vala @@ -622,7 +622,7 @@ public class IndicatorSound.Service: Object { bool ignore_warning_this_time = _volume_warning.ignore_high_volume; var warn = loud && this.notify_server_supports_actions - && !this.volume_control.high_volume_approved + && !_volume_warning.high_volume_approved && !ignore_warning_this_time; if (waiting_user_approve_warn && !_options.is_loud(volume_control.volume)) { volume_control.set_warning_volume(); @@ -638,7 +638,7 @@ public class IndicatorSound.Service: Object { warn_notification.clear_actions(); warn_notification.add_action ("ok", _("OK"), (n, a) => { stop_clamp_to_high_timeout(); - volume_control.approve_high_volume (); + _volume_warning.approve_high_volume (); // restore the volume the user introduced VolumeControl.Volume vol = new VolumeControl.Volume(); vol.volume = volume_control.get_pre_clamped_volume(); @@ -658,7 +658,7 @@ public class IndicatorSound.Service: Object { } else { if (!waiting_user_approve_warn) { close_notification(warn_notification); - + if (notify_server_supports_sync && !block_info_notifications && !ignore_warning_this_time) { /* Determine Label */ string volume_label = get_notification_label (); |