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

Proposed by Sebastien Bacher
Status: Merged
Approved by: Ted Gould
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
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

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

review: Approve
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/actions-live.cpp'
2--- src/actions-live.cpp 2015-03-31 23:54:04 +0000
3+++ src/actions-live.cpp 2015-08-27 14:10:38 +0000
4@@ -61,18 +61,18 @@
5
6 void LiveActions::desktop_open_settings_app()
7 {
8- auto path = g_find_program_in_path("unity-control-center");
9-
10- if ((path != nullptr) && (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0))
11- {
12- execute_command("unity-control-center datetime");
13+ if (g_getenv ("MIR_SOCKET") != nullptr)
14+ {
15+ dispatch_url("settings:///system/time-date");
16+ }
17+ else if ((g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0))
18+ {
19+ execute_command("unity-control-center datetime");
20 }
21 else
22 {
23 execute_command("gnome-control-center datetime");
24 }
25-
26- g_free (path);
27 }
28
29 bool LiveActions::desktop_has_calendar_app() const

Subscribers

People subscribed via source and target branches