From 1762c40b0f1b0a12726974021497e3f29cb65f39 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 10 Jan 2014 15:23:04 +1300 Subject: Use unity-control-center if it is available --- src/service.vala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index 25a7b18..12f3c46 100644 --- a/src/service.vala +++ b/src/service.vala @@ -123,7 +123,12 @@ public class IndicatorSound.Service { if (env == "xubuntu" || env == "ubuntustudio") cmd = "pavucontrol"; else - cmd = "gnome-control-center sound"; + { + if (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); -- cgit v1.2.3 From 09cf092387e47593d610f4177adc19ceafa5972b Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Wed, 22 Jan 2014 10:32:09 +1300 Subject: Only run unity-control-center under unity --- src/service.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index 12f3c46..ea66dca 100644 --- a/src/service.vala +++ b/src/service.vala @@ -124,7 +124,7 @@ public class IndicatorSound.Service { cmd = "pavucontrol"; else { - if (Environment.find_program_in_path ("unity-control-center") != null) + 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"; -- cgit v1.2.3