From 5d0a213d11ac42667a1d34f20dd504ab6e1241b4 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 27 Aug 2015 15:04:46 +0100 Subject: under unity8 start system-settings instead unity-control-center, don't special case u-c-c by looking for the binary, Unity installations come with it installed --- src/actions-live.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/actions-live.cpp') diff --git a/src/actions-live.cpp b/src/actions-live.cpp index 3cbfb78..90186c3 100644 --- a/src/actions-live.cpp +++ b/src/actions-live.cpp @@ -61,18 +61,18 @@ void LiveActions::dispatch_url(const std::string& url) void LiveActions::desktop_open_settings_app() { - auto path = g_find_program_in_path("unity-control-center"); - - if ((path != nullptr) && (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)) + if (g_getenv ("MIR_SOCKET") != nullptr) + { + dispatch_url("settings:///system/time-date"); + } + else if ((g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)) { - execute_command("unity-control-center datetime"); + execute_command("unity-control-center datetime"); } else { execute_command("gnome-control-center datetime"); } - - g_free (path); } bool LiveActions::desktop_has_calendar_app() const -- cgit v1.2.3