aboutsummaryrefslogtreecommitdiff
path: root/src/service.vala
diff options
context:
space:
mode:
authorXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-12-17 18:03:27 +0100
committerXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-12-17 18:03:27 +0100
commit093d3198061540ce76b2f526926cdbb6c929bcd8 (patch)
treed1afb56abeb9fc3f88d556745d2937c4106ae404 /src/service.vala
parent7e7f4af3361d7275cb360db0e3dbff3aac569ebe (diff)
downloadayatana-indicator-sound-093d3198061540ce76b2f526926cdbb6c929bcd8.tar.gz
ayatana-indicator-sound-093d3198061540ce76b2f526926cdbb6c929bcd8.tar.bz2
ayatana-indicator-sound-093d3198061540ce76b2f526926cdbb6c929bcd8.zip
Added workaround for Maroon in Trouble, second option
Diffstat (limited to 'src/service.vala')
-rw-r--r--src/service.vala7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/service.vala b/src/service.vala
index 312fec5..0a7e108 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -611,9 +611,11 @@ public class IndicatorSound.Service: Object {
notify_server_caps_checked = true;
var loud = volume_control.high_volume;
+ bool ignore_warning_this_time = this.volume_control.ignore_high_volume;
var warn = loud
&& this.notify_server_supports_actions
- && !this.volume_control.high_volume_approved;
+ && !this.volume_control.high_volume_approved
+ && !ignore_warning_this_time;
if (waiting_user_approve_warn && volume_control.below_warning_volume) {
volume_control.set_warning_volume();
close_notification(warn_notification);
@@ -649,8 +651,7 @@ public class IndicatorSound.Service: Object {
if (!waiting_user_approve_warn) {
close_notification(warn_notification);
- if (notify_server_supports_sync && !block_info_notifications) {
-
+ if (notify_server_supports_sync && !block_info_notifications && !ignore_warning_this_time) {
/* Determine Label */
string volume_label = get_notification_label ();