aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog11
-rw-r--r--src/service.vala18
2 files changed, 23 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index d89524b..edac3aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+indicator-sound (12.10.2+15.10.20150812.3-0ubuntu1) vivid; urgency=medium
+
+ [ CI Train Bot ]
+ * New rebuild forced.
+
+ [ Charles Kerr ]
+ * When showing a "Loud volumes can damage your hearing" confirmation
+ warning, clamp the volume until the user hits "OK". (LP: #1481913)
+
+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 12 Aug 2015 20:55:05 +0000
+
indicator-sound (12.10.2+15.10.20150807.6-0ubuntu1) vivid; urgency=medium
[ CI Train Bot ]
diff --git a/src/service.vala b/src/service.vala
index 4857634..a08edf3 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -129,12 +129,11 @@ public class IndicatorSound.Service: Object {
}
private void show_notification(Notify.Notification? n) {
- if (n != null) {
- try {
- n.show ();
- } catch (GLib.Error e) {
- warning ("Unable to show notification: %s", e.message);
- }
+ return_if_fail (n != null);
+ try {
+ n.show ();
+ } catch (GLib.Error e) {
+ warning ("Unable to show notification: %s", e.message);
}
}
@@ -207,6 +206,13 @@ public class IndicatorSound.Service: Object {
void activate_desktop_settings (SimpleAction action, Variant? param) {
var env = Environment.get_variable ("DESKTOP_SESSION");
string cmd;
+
+ if (Environment.get_variable ("MIR_SOCKET") != null)
+ {
+ UrlDispatch.send ("settings:///system/sound");
+ return;
+ }
+
if (env == "xubuntu" || env == "ubuntustudio")
cmd = "pavucontrol";
else if (env == "mate")