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

Proposed by Sebastien Bacher on 2015-08-27
Status: Merged
Approved by: Charles Kerr on 2015-08-27
Approved revision: 289
Merged at revision: 289
Proposed branch: lp:~seb128/indicator-power/unity8-system-settings
Merge into: lp:indicator-power/15.10
Diff against target: 17 lines (+6/-1)
1 file modified
src/service.c (+6/-1)
To merge this branch: bzr merge lp:~seb128/indicator-power/unity8-system-settings
Reviewer Review Type Date Requested Status
Charles Kerr (community) 2015-08-27 Approve on 2015-08-27
PS Jenkins bot (community) continuous-integration Approve on 2015-08-27
Review via email: mp+269370@code.launchpad.net

Commit message

under unity8 start system-settings instead unity-control-center

Description of the change

under unity8 start system-settings instead unity-control-center

To post a comment you must log in.
289. By Sebastien Bacher on 2015-08-27

under unity8 start system-settings instead unity-control-center

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/service.c'
2--- src/service.c 2015-05-14 21:53:02 +0000
3+++ src/service.c 2015-08-27 14:19:07 +0000
4@@ -783,7 +783,12 @@
5
6 if (control_center_cmd == NULL)
7 {
8- if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
9+ if (g_getenv ("MIR_SOCKET") != NULL)
10+ {
11+ url_dispatch_send("settings:///system/battery", NULL, NULL);
12+ return;
13+ }
14+ else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
15 {
16 control_center_cmd = "xfce4-power-manager-settings";
17 }

Subscribers

People subscribed via source and target branches