diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-09-17 16:31:37 +0200 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-09-17 16:31:37 +0200 |
| commit | c258047f9704b1baafc4bf25e92cba66101d8744 (patch) | |
| tree | eb9cb412684fae45e4b4c2c837544769d6e4723b | |
| parent | 619162fa3519848d135b4502f782cb4f118b5fac (diff) | |
| parent | 918c9b9a95573b0dfe0e2e67ef30b998b5576e82 (diff) | |
| download | ayatana-indicator-sound-c258047f9704b1baafc4bf25e92cba66101d8744.tar.gz ayatana-indicator-sound-c258047f9704b1baafc4bf25e92cba66101d8744.tar.bz2 ayatana-indicator-sound-c258047f9704b1baafc4bf25e92cba66101d8744.zip | |
merged with trunk
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | src/service.vala | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 3a8f422..21290c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +indicator-sound (12.10.2+15.10.20150915-0ubuntu1) wily; urgency=medium + + [ Sebastien Bacher ] + * under unity8 start system-settings instead unity-control-center (LP: + #1489427) + + [ Xavi Garcia Mena ] + * Merged lp:~xavi-garcia-mena/indicator-sound/icon-volume-zero + + -- Sebastien Bacher <seb128@ubuntu.com> Tue, 15 Sep 2015 08:19:51 +0000 + indicator-sound (12.10.2+15.10.20150812.3-0ubuntu1) wily; urgency=medium [ CI Train Bot ] diff --git a/src/service.vala b/src/service.vala index a69e231..a08edf3 100644 --- a/src/service.vala +++ b/src/service.vala @@ -206,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") |