diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2015-10-05 13:06:35 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2015-10-05 13:06:35 -0500 |
| commit | 55ec6e57ee6ec5930b2ec74ececde52ead16f935 (patch) | |
| tree | 7c23970516b3faeb0d70ecaa95888d5dfd959aa0 /src/actions-live.cpp | |
| parent | 645e1ade17334468583a0227cf685940ce6043aa (diff) | |
| parent | 3f3445ae0c7c47f3351bccbb4e653c875da89f85 (diff) | |
| download | ayatana-indicator-datetime-55ec6e57ee6ec5930b2ec74ececde52ead16f935.tar.gz ayatana-indicator-datetime-55ec6e57ee6ec5930b2ec74ececde52ead16f935.tar.bz2 ayatana-indicator-datetime-55ec6e57ee6ec5930b2ec74ececde52ead16f935.zip | |
sync with trunk
Diffstat (limited to 'src/actions-live.cpp')
| -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 |