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

Proposed by Sebastien Bacher on 2015-08-27
Status: Merged
Approved by: Charles Kerr on 2015-08-27
Approved revision: 90
Merged at revision: 90
Proposed branch: lp:~seb128/indicator-bluetooth/unity8-system-settings
Merge into: lp:indicator-bluetooth/15.10
Diff against target: 14 lines (+3/-1)
1 file modified
src/desktop.vala (+3/-1)
To merge this branch: bzr merge lp:~seb128/indicator-bluetooth/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+269375@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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/desktop.vala'
2--- src/desktop.vala 2014-12-11 02:50:16 +0000
3+++ src/desktop.vala 2015-08-27 14:32:01 +0000
4@@ -208,7 +208,9 @@
5
6 void show_settings (string panel)
7 {
8- if (Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity" && Environment.find_program_in_path ("unity-control-center") != null)
9+ if (Environment.get_variable ("MIR_SOCKET") != null)
10+ UrlDispatch.send ("settings:///system/bluetooth");
11+ else if (Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity" && Environment.find_program_in_path ("unity-control-center") != null)
12 spawn_command_line_async ("unity-control-center " + panel);
13 else
14 spawn_command_line_async ("gnome-control-center " + panel);

Subscribers

People subscribed via source and target branches