Merge lp:~philip.scott/wingpanel-indicator-sound/wingpanel-indicator-sound into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

[Felipe Escoto]

Makes sure the sound confirmation is closed whenever the sound indicator's popover is opened.

* If the confirmation was opened, close it when the popover appears
* If the popover is opened, do not show a notification when you scroll on the icon

It does not fix: https://bugs.launchpad.net/wingpanel-indicator-sound/+bug/1463578 though.

A small change with how the settings panel opens also slipped by, before if you open the sound settings from the indicator, you sometimes couldn't interact with the sound indicator until you closed switchboard. But this is fixed on this merge by closing the indicator before opening switchboard

[lp:~philip.scott/wingpanel-indicator-sound/wingpanel-indicator-sound]

24. By Felipe Escoto on 2015-06-25

Don't play a sound if reached max volume

[kay van der Zander (kay20)]

Hey please improve:
Dif line 16 17 remove space behind bracket
Dif line 34 35 remove space behind bracket
Dif line 49 do something with the error information

review: Needs Fixing

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2015-06-22 19:30:34 +0000
+++ src/Indicator.vala	2015-06-25 17:42:44 +0000
@@ -39,6 +39,7 @@
 
     private Services.Settings settings;
 
+    bool open = false;
     bool mute_blocks_sound = false;
     uint sound_was_blocked_timeout_id;
 
@@ -76,7 +77,7 @@
                                  Canberra.PROP_APPLICATION_LANGUAGE, locale,
                                  null);
         ca_context.open ();
-    }
+    } 
 
     ~Indicator () {
         if (this.sound_was_blocked_timeout_id > 0) {
@@ -236,7 +237,7 @@
                 vol.reason = Services.VolumeControl.VolumeReasons.USER_KEYPRESS;
                 this.volume_control.volume = vol;
 
-                if (this.notification != null && v >= -0.05 && v <= (this.max_volume + 0.05)) {
+                if (open == false && this.notification != null && v >= -0.05 && v <= (this.max_volume + 0.05)) {
                     string icon;
                     if (v <= 0.0)
                         icon = "notification-audio-volume-off";
@@ -255,7 +256,9 @@
                     }
                     catch (Error e) {
                         warning ("unable to show notification: %s", e.message);
-                    }
+                    } 
+                } else if (v <= (this.max_volume + 0.05)) {
+                    play_sound_blubble ();
                 }
 
                 return Gdk.EVENT_STOP;
@@ -351,16 +354,20 @@
     }
 
     public override void opened () {
-
+        open = true;
+        try {
+            notification.close ();
+        } catch (Error E) {}
     }
 
     public override void closed () {
+        open = false;
     }
 
     private void show_settings () {
         var cmd = new Granite.Services.SimpleCommand ("/usr/bin", SETTINGS_EXEC);
+        close ();
         cmd.run ();
-        close ();
     }
 
     private void play_sound_blubble () {