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

Proposed by Robert Ancell on 2014-01-21
Status: Rejected
Rejected by: Sebastien Bacher on 2014-01-22
Proposed branch: lp:~robert-ancell/indicator-power/ucc-only-in-unity
Merge into: lp:indicator-power/14.04
Diff against target: 12 lines (+1/-1)
1 file modified
src/service.c (+1/-1)
To merge this branch: bzr merge lp:~robert-ancell/indicator-power/ucc-only-in-unity
Reviewer Review Type Date Requested Status
Sebastien Bacher Disapprove on 2014-01-22
PS Jenkins bot (community) continuous-integration Needs Fixing on 2014-01-22
Ted Gould (community) 2014-01-21 Approve on 2014-01-22
Review via email: mp+202559@code.launchpad.net

Commit message

Only run unity-control-center under unity

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

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

Sebastien Bacher (seb128) wrote :

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) wrote :

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
Sebastien Bacher (seb128) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/service.c'
2--- src/service.c 2014-01-10 02:02:31 +0000
3+++ src/service.c 2014-01-21 21:50:38 +0000
4@@ -695,7 +695,7 @@
5 gchar *path;
6
7 path = g_find_program_in_path ("unity-control-center");
8- if (path != NULL)
9+ if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0 && path != NULL)
10 execute_command ("unity-control-center power");
11 else
12 execute_command ("gnome-control-center power");

Subscribers

People subscribed via source and target branches