indicator-power

Merge lp://staging/~ochosi/indicator-power/xfce4-powermanager-settings into lp://staging/indicator-power/14.04

Proposed by Simon Steinbeiß on 2014-01-21

Status:	Merged
Merged at revision:	222
Proposed branch:	lp://staging/~ochosi/indicator-power/xfce4-powermanager-settings
Merge into:	lp://staging/indicator-power/14.04
Diff against target:	25 lines (+10/-6) 1 file modified src/service.c (+10/-6)
To merge this branch:	bzr merge lp://staging/~ochosi/indicator-power/xfce4-powermanager-settings
Related bugs:	Link a bug report
Related blueprints:	Xubuntu 14.04: New features (Undefined)

Reviewer	Date Requested	Status
Sebastien Bacher		Needs Fixing on 2014-01-22
Lars Karlitski	2014-01-21	Pending
Review via email: mp+202514@code.staging.launchpad.net

This tiny patch (along the lines of indicator-sound: http://bazaar.launchpad.net/~indicator-applet-developers/indicator-sound/trunk.14.04/view/head:/src/service.vala#L120) adds support for opening xfce4-powermanager-settings if indicator-power is in a Xubuntu session. It will also make it easier to add other desktops, e.g. if ubuntu-studio decide they want to use it as well.

This would be very useful, as we (Xubuntu team) plan to use indicator-power by default in 14.04.

(Rebased version of the patch on top of Robert's u-c-c branch that just got merged.)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-01-22:

Thanks for the work there, that seems slightly buggy though, in the case where the session is not Unity you do

" gchar *path
...
g_free (path);"

that's likely to lead to invalid frees since you don't init path to NULL

review: Needs Fixing

Revision history for this message

Lars Karlitski (larsu) wrote on 2014-01-22:

Thanks for the patch. I've fixed the free() and rearranged the logic a bit to have a proper fallback on non-unity sessions at lp:~larsu/indicator-power/xfce-control-center