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

[Sebastien Bacher]

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

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

[lp:~seb128/indicator-power/unity8-system-settings]

289. By Sebastien Bacher on 2015-08-27

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/152/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-wily-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-wily-armhf-ci/2/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/service.c'
--- src/service.c	2015-05-14 21:53:02 +0000
+++ src/service.c	2015-08-27 14:19:07 +0000
@@ -783,7 +783,12 @@
 
   if (control_center_cmd == NULL)
     {
-      if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
+      if (g_getenv ("MIR_SOCKET") != NULL)
+        {
+          url_dispatch_send("settings:///system/battery", NULL, NULL);
+          return;
+        }
+      else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
         {
           control_center_cmd = "xfce4-power-manager-settings";
         }