Merge lp:~robert-ancell/indicator-power/ucc-only-in-unity into lp:indicator-power/14.04

[Robert Ancell]

Only run unity-control-center under unity

[Robert Ancell (robert-ancell)]

This updates the recent merge to match the updated behaviour of the other indicators at Ted's request.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Hum, I'm not sure that's the right thing to do (it also make me wonder if we should have prefixed the control center with "ubuntu" rather than "unity"). In practice it feels like that GNOME sessions are going to use g-c-c and that other sessions might want to use u-c-c (including GNOME classic and XFCE since they use some indicators)...

[Ted Gould (ted)]

Talked with seb on IRC about this. We're going to leave it like this for now, but eventually phase out g-c-c support as it doesn't make sense. But that's needed as a migration path today.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-power-autolanding/65/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3942/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-amd64-autolanding/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-trusty-armhf-autolanding/12/console

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

The change there shouldn't be needed/is superseeded by http://bazaar.launchpad.net/~indicator-applet-developers/indicator-power/trunk.14.04/revision/222 which added support for xfce's tool and included the needed bit for u-c-c

review: Disapprove

Unmerged revisions

222. By Robert Ancell on 2014-01-21

Only run unity-control-center under unity

=== modified file 'src/service.c'
--- src/service.c	2014-01-10 02:02:31 +0000
+++ src/service.c	2014-01-21 21:50:38 +0000
@@ -695,7 +695,7 @@
   gchar *path;
 
   path = g_find_program_in_path ("unity-control-center");
-  if (path != NULL)
+  if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0 && path != NULL)
     execute_command ("unity-control-center power");
   else
     execute_command ("gnome-control-center power");