diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-12-23 14:35:46 +0100 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-12-23 14:35:46 +0100 |
| commit | c0b4e9399cd68e10489108a3f50556b6d86727a4 (patch) | |
| tree | f67ee5f85c29c732f9f73abbbab371c279b1caab /src/service.vala | |
| parent | da78e6c75cab23d837cb4768efa3838ddb2286e7 (diff) | |
| parent | 9da17031233db5f7961f3dd7be69c8a3bc13bb27 (diff) | |
| download | ayatana-indicator-sound-c0b4e9399cd68e10489108a3f50556b6d86727a4.tar.gz ayatana-indicator-sound-c0b4e9399cd68e10489108a3f50556b6d86727a4.tar.bz2 ayatana-indicator-sound-c0b4e9399cd68e10489108a3f50556b6d86727a4.zip | |
Conflicts resolved with restored branch
Diffstat (limited to 'src/service.vala')
| -rw-r--r-- | src/service.vala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/service.vala b/src/service.vala index 12e2ac2..985d434 100644 --- a/src/service.vala +++ b/src/service.vala @@ -40,7 +40,7 @@ public class IndicatorSound.Service: Object { warn_notification.set_hint ("x-canonical-non-shaped-icon", "true"); warn_notification.set_hint ("x-canonical-snap-decisions", "true"); warn_notification.set_hint ("x-canonical-private-affirmative-tint", "true"); - warn_notification.closed.connect((n) => { n.clear_actions(); }); + warn_notification.closed.connect((n) => { n.clear_actions(); waiting_user_approve_warn=false; }); BusWatcher.watch_namespace (GLib.BusType.SESSION, "org.freedesktop.Notifications", () => { debug("Notifications name appeared"); }, @@ -609,7 +609,10 @@ public class IndicatorSound.Service: Object { var warn = loud && this.notify_server_supports_actions && !this.volume_control.high_volume_approved; - + if (waiting_user_approve_warn && volume_control.below_warning_volume) { + volume_control.set_warning_volume(); + close_notification(warn_notification); + } if (warn) { close_notification(info_notification); if (_pre_warn_volume == null) { |