diff options
author | Sebastien Bacher <seb128@ubuntu.com> | 2015-08-27 15:04:46 +0100 |
---|---|---|
committer | Sebastien Bacher <seb128@ubuntu.com> | 2015-08-27 15:04:46 +0100 |
commit | 5d0a213d11ac42667a1d34f20dd504ab6e1241b4 (patch) | |
tree | f1f55544573cca06180a971b74ce5579d84a6fcd | |
parent | ad2d17a82ebe369adca6b477d5ecb362e243f585 (diff) | |
download | ayatana-indicator-datetime-5d0a213d11ac42667a1d34f20dd504ab6e1241b4.tar.gz ayatana-indicator-datetime-5d0a213d11ac42667a1d34f20dd504ab6e1241b4.tar.bz2 ayatana-indicator-datetime-5d0a213d11ac42667a1d34f20dd504ab6e1241b4.zip |
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
-rw-r--r-- | src/actions-live.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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 |