aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2014-01-22 17:37:20 +0000
committerTarmac <Unknown>2014-01-22 17:37:20 +0000
commitb52c2b786f3c8cba4a696fd3b018a2465f51cad8 (patch)
treebfbe9e04b1559df640a7d8bedfd253d54cff44d4
parentf7ab50b8a75ae98e8ec2f8fb4a1da0f66d976ef6 (diff)
parent09cf092387e47593d610f4177adc19ceafa5972b (diff)
downloadayatana-indicator-sound-b52c2b786f3c8cba4a696fd3b018a2465f51cad8.tar.gz
ayatana-indicator-sound-b52c2b786f3c8cba4a696fd3b018a2465f51cad8.tar.bz2
ayatana-indicator-sound-b52c2b786f3c8cba4a696fd3b018a2465f51cad8.zip
Use unity-control-center if it is available. Fixes: https://bugs.launchpad.net/bugs/1257505.
Approved by Ted Gould, PS Jenkins bot.
-rw-r--r--debian/control2
-rw-r--r--src/service.vala7
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index ab0c0f1..55aae86 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
pulseaudio,
-Recommends: gnome-control-center | ubuntu-system-settings,
+Recommends: unity-control-center | gnome-control-center | ubuntu-system-settings,
Description: System sound indicator.
System sound indicator which provides easy control of the PulseAudio sound
daemon.
diff --git a/src/service.vala b/src/service.vala
index f228746..f7d86bb 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -124,7 +124,12 @@ public class IndicatorSound.Service {
if (env == "xubuntu" || env == "ubuntustudio")
cmd = "pavucontrol";
else
- cmd = "gnome-control-center sound";
+ {
+ if (Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity" && Environment.find_program_in_path ("unity-control-center") != null)
+ cmd = "unity-control-center sound";
+ else
+ cmd = "gnome-control-center sound";
+ }
try {
Process.spawn_command_line_async (cmd);