From dce18d4a609242dddd29ac05955ad79ae803d49f Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 10 Jan 2014 12:13:24 +1300 Subject: Use unity-control-center if it is available --- src/desktop.vala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/desktop.vala b/src/desktop.vala index 198101a..26b86f5 100644 --- a/src/desktop.vala +++ b/src/desktop.vala @@ -211,7 +211,10 @@ class Desktop: Profile void show_settings (string panel) { - spawn_command_line_async ("gnome-control-center " + panel); + if (Environment.find_program_in_path ("unity-control-center") != null) + spawn_command_line_async ("unity-control-center " + panel); + else + spawn_command_line_async ("gnome-control-center " + panel); } Action create_discoverable_action (Bluetooth bluetooth) -- cgit v1.2.3 From d36408225a587dd67e8a40719028e264bacad475 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Wed, 22 Jan 2014 10:29:37 +1300 Subject: Only run unity-control-center under unity --- src/desktop.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/desktop.vala b/src/desktop.vala index 26b86f5..a6cd433 100644 --- a/src/desktop.vala +++ b/src/desktop.vala @@ -211,7 +211,7 @@ class Desktop: Profile void show_settings (string panel) { - 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) spawn_command_line_async ("unity-control-center " + panel); else spawn_command_line_async ("gnome-control-center " + panel); -- cgit v1.2.3