Merge lp:~seb128/indicator-datetime/unity8-system-settings into lp:indicator-datetime/15.10

Proposed by Sebastien Bacher on 2015-08-27
Status: Merged
Approved by: Ted Gould on 2015-08-27
Approved revision: 420
Merged at revision: 421
Proposed branch: lp:~seb128/indicator-datetime/unity8-system-settings
Merge into: lp:indicator-datetime/15.10
Diff against target: 29 lines (+7/-7)
1 file modified
src/actions-live.cpp (+7/-7)
To merge this branch: bzr merge lp:~seb128/indicator-datetime/unity8-system-settings
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve on 2015-08-27
Ted Gould (community) 2015-08-27 Approve on 2015-08-27
PS Jenkins bot (community) continuous-integration Approve on 2015-08-27
Review via email: mp+269368@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Ted Gould (ted) wrote :

Don't love dropping the path, but I think that it makes sense.

review: Approve
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/actions-live.cpp'
--- src/actions-live.cpp 2015-03-31 23:54:04 +0000
+++ src/actions-live.cpp 2015-08-27 14:10:38 +0000
@@ -61,18 +61,18 @@
6161
62void LiveActions::desktop_open_settings_app()62void LiveActions::desktop_open_settings_app()
63{63{
64 auto path = g_find_program_in_path("unity-control-center");64 if (g_getenv ("MIR_SOCKET") != nullptr)
6565 {
66 if ((path != nullptr) && (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0))66 dispatch_url("settings:///system/time-date");
67 {67 }
68 execute_command("unity-control-center datetime"); 68 else if ((g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0))
69 {
70 execute_command("unity-control-center datetime");
69 }71 }
70 else72 else
71 {73 {
72 execute_command("gnome-control-center datetime");74 execute_command("gnome-control-center datetime");
73 }75 }
74
75 g_free (path);
76}76}
7777
78bool LiveActions::desktop_has_calendar_app() const78bool LiveActions::desktop_has_calendar_app() const

Subscribers

People subscribed via source and target branches