aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2015-09-09 16:40:49 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2015-09-09 16:40:49 +0000
commit3c40d739e032f65e7e35c29de14b1fafaa1f7c28 (patch)
treeacad02797cc6cbad1bc2c487f16501a8a555fba9 /src
parent13bcfccd0c9038c4b4c20c37c8d3267a5e6fbfee (diff)
parent5d0a213d11ac42667a1d34f20dd504ab6e1241b4 (diff)
downloadayatana-indicator-datetime-3c40d739e032f65e7e35c29de14b1fafaa1f7c28.tar.gz
ayatana-indicator-datetime-3c40d739e032f65e7e35c29de14b1fafaa1f7c28.tar.bz2
ayatana-indicator-datetime-3c40d739e032f65e7e35c29de14b1fafaa1f7c28.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 Fixes: #1489481 Approved by: Ted Gould, Charles Kerr, PS Jenkins bot
Diffstat (limited to 'src')
-rw-r--r--src/actions-live.cpp12
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