Merge lp://qastaging/~lool/qtpowerd/misc-fixes into lp://qastaging/~music-app-dev/qtpowerd/trunk

Proposed by Loïc Minier
Status: Merged
Merged at revision: 5
Proposed branch: lp://qastaging/~lool/qtpowerd/misc-fixes
Merge into: lp://qastaging/~music-app-dev/qtpowerd/trunk
Diff against target: 233 lines (+83/-47)
7 files modified
QtPowerd.cpp (+50/-23)
QtPowerd.h (+12/-7)
debian/changelog (+6/-0)
plugin.cpp (+6/-6)
plugin.h (+3/-4)
qmldir (+2/-3)
qtpowerd.pro (+4/-4)
To merge this branch: bzr merge lp://qastaging/~lool/qtpowerd/misc-fixes
Reviewer Review Type Date Requested Status
David Planella Needs Information
Review via email: mp+188718@code.qastaging.launchpad.net

Commit message

Misc fixes allowing qtpowerd to function with music-app.

Description of the change

Hi there,

Misc fixes in here, but more importantly this fixes the requestSysState() and clearSysState() so that it basically works.

On the long run, I think we ought to:
* never use this from apps since some backgrond music service should do it for them
* allow for multiple locks or various types, even if apps should not take them most of the time, sometimes it makes sense; there are other reasons for bindings such as tracking display state changes (as unity8 Shell does)
* allow naming the locks (currently qtpowerd hardcodes "music-app-background")
* move this to powerd itself to provide; this would allow using the header

However I think this is good enough for music-app for 13.10 :-)

I might try to fix some of the other bits there if time allow.

I also wonder if the name Powerd 0.1 might break unity8's Powerd 0.1 plugin.

To post a comment you must log in.
17. By Loïc Minier

Rename from Powerd to QtPowerd to avoid clash with Unity8 Shell plugi.

18. By Loïc Minier

Bump to 0.2.

Revision history for this message
Loïc Minier (lool) wrote :

So indeed this clashed with Unity8 Shell's powerd plugin; fixed in r17/r18.

Revision history for this message
Victor Thompson (vthompson) wrote :

The plugin is under Ubuntu.Powerd, so I don't think it should break Unity's plugin. Changing the version to 0.2 doesn't necessary fix the issue--if it exists--however. Maybe we should rename the plugin to something directly related to "keepAlive"?

Revision history for this message
Victor Thompson (vthompson) wrote :

Nevermind my previous comment. I thought you bumped the version to deconflict with the Unity plugin. Renaming the plugin as you are should accomplish this.

Revision history for this message
David Planella (dpm) wrote :

I guess another solution would have been that we install it as a private plugin: the settings app does that for example, each panel being a private plugin installed within the app and not accessible by other applications.

So either the music app or Unity could have installed their powerd plugin privately to prevent it being picked up by other apps.

The question that comes to mind is: could we not just have one single powerd plugin that can be used by both Unity and the Music app?

review: Needs Information

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: