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

[Sebastien Bacher]

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

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

[Sebastien Bacher (seb128)]

backport to vivid-overlay is going to be needed for the pocket desktop image

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-15.04-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-15.04-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-15.04-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-15.04-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-bluetooth-15.04-ci/3/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

that was merged in when rebasing the package on the wily version

=== modified file 'src/desktop.vala'
--- src/desktop.vala	2014-01-21 21:29:37 +0000
+++ src/desktop.vala	2015-09-15 14:14:25 +0000
@@ -211,7 +211,9 @@
 
   void show_settings (string panel)
   {
-    if (Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity" && Environment.find_program_in_path ("unity-control-center") != null)
+    if (Environment.get_variable ("MIR_SOCKET") != null)
+      UrlDispatch.send ("settings:///system/bluetooth");
+    else if (Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity" && Environment.find_program_in_path ("unity-control-center") != null)
       spawn_command_line_async ("unity-control-center " + panel);
     else
       spawn_command_line_async ("gnome-control-center " + panel);