Merge lp:~robert-ancell/indicator-power/unity-control-center2 into lp:indicator-power/14.04

[Robert Ancell]

Use unity-control-center if it is available

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:221
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/78/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-armhf-ci/15/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Shouldn't we list u-c-c first in the recommends order since that's our default desktop/where indicators are used most/the first choice in the code? (same comment for the similar merge requests on other indicators)

[Robert Ancell (robert-ancell)]

> Shouldn't we list u-c-c first in the recommends order since that's our default
> desktop/where indicators are used most/the first choice in the code? (same
> comment for the similar merge requests on other indicators)

Yes. For some reason at the time I was thinking that would pull u-c-c in before it was ready but I don't think that's the case since ubuntu-desktop depends on gnome-control-center.

[lp:~robert-ancell/indicator-power/unity-control-center2]

222. By Robert Ancell on 2014-01-14

Recommend unity-control-center before gnome-control-center

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:222
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/79/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-armhf-ci/16/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

That looks fine to me, comment approving and letting somebody from the indicator team changing the status if they like it (would be nice to get it reviewed, we need those changes to land to be able to change the default settings app to unity-control-center on the desktop image)

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-09-16 01:51:58 +0000
+++ debian/control	2014-01-14 04:40:57 +0000
@@ -24,7 +24,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          upower,
-Recommends: gnome-control-center (>= 3.1) | ubuntu-system-settings,
+Recommends: unity-control-center | gnome-control-center (>= 3.1) | ubuntu-system-settings,
             indicator-applet (>= 0.2) | indicator-renderer,
 Description: Indicator showing power state.
  This indicator displays current power management information and gives 

=== modified file 'src/service.c'
--- src/service.c	2013-12-04 11:59:21 +0000
+++ src/service.c	2014-01-14 04:40:57 +0000
@@ -692,7 +692,14 @@
                        GVariant      * param  G_GNUC_UNUSED,
                        gpointer        gself  G_GNUC_UNUSED)
 {
-  execute_command ("gnome-control-center power");
+  gchar *path;
+
+  path = g_find_program_in_path ("unity-control-center");
+  if (path != NULL)
+    execute_command ("unity-control-center power");
+  else
+    execute_command ("gnome-control-center power");
+  g_free (path);
 }
 
 static void