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

[Sebastien Bacher]

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

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/desktop.vala'
--- src/desktop.vala	2014-12-11 02:50:16 +0000
+++ src/desktop.vala	2015-08-27 14:32:01 +0000
@@ -208,7 +208,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);