unity-2d

Merge lp://staging/~osomon/unity-2d/natty-panel-backport-oneiric-changes into lp://staging/unity-2d/3.0

natty-panel-backport-oneiric-changes
Merge into natty

Proposed by Olivier Tilloy on 2011-09-06

Status:	Merged
Approved by:	Florian Boucault on 2011-09-14
Approved revision:	690
Merged at revision:	689
Proposed branch:	lp://staging/~osomon/unity-2d/natty-panel-backport-oneiric-changes
Merge into:	lp://staging/unity-2d/3.0
Diff against target:	476 lines (+77/-42) 30 files modified libunity-2d-private/src/panelapplet.cpp (+21/-3) libunity-2d-private/src/panelapplet.h (+9/-1) libunity-2d-private/src/panelappletproviderinterface.h (+1/-1) panel/app/panelmanager.cpp (+2/-2) panel/app/panelmanager.h (+2/-0) panel/applets/appindicator/appindicatorapplet.cpp (+2/-1) panel/applets/appindicator/appindicatorapplet.h (+1/-1) panel/applets/appindicator/plugin.cpp (+2/-2) panel/applets/appindicator/plugin.h (+1/-1) panel/applets/appname/appnameapplet.cpp (+3/-2) panel/applets/appname/appnameapplet.h (+1/-1) panel/applets/appname/plugin.cpp (+2/-2) panel/applets/appname/plugin.h (+1/-1) panel/applets/homebutton/homebuttonapplet.cpp (+3/-2) panel/applets/homebutton/homebuttonapplet.h (+1/-1) panel/applets/homebutton/plugin.cpp (+2/-2) panel/applets/homebutton/plugin.h (+1/-1) panel/applets/indicator/indicatorapplet.cpp (+2/-1) panel/applets/indicator/indicatorapplet.h (+1/-1) panel/applets/indicator/plugin.cpp (+2/-2) panel/applets/indicator/plugin.h (+1/-1) panel/applets/legacytray/legacytrayapplet.cpp (+3/-2) panel/applets/legacytray/legacytrayapplet.h (+1/-1) panel/applets/legacytray/plugin.cpp (+2/-2) panel/applets/legacytray/plugin.h (+1/-1) panel/applets/separator/plugin.cpp (+2/-2) panel/applets/separator/plugin.h (+1/-1) panel/applets/separator/separatorapplet.cpp (+3/-2) panel/applets/separator/separatorapplet.h (+1/-1) panel/tests/homebuttonapplettest.cpp (+2/-1)
To merge this branch:	bzr merge lp://staging/~osomon/unity-2d/natty-panel-backport-oneiric-changes
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
unity-2d-team		2011-09-06	Pending
Review via email: mp+74223@code.staging.launchpad.net

Commit message

[panel] Backport an interface change from the oneiric branch (4.0): pass the panel as a parameter to the constructors of the applets.

Revision history for this message

Alberto Mardegan (mardy) wrote on 2011-09-07:

Thanks for this contribution!

The merge of code from the Oneiric branch is obviously fine.

About the ready() signal, while reviewing your code I started thinking about the emission of the signal from the panelManager; I was thinking of having it emitted by the panel subclass after loading the plugins (maybe with QMetaObject::invokeMethod() with a queued connection). And this led me to wonder, do we really need this signal at all? Why can't the plugins themselves call their lengthy methods with a queued connection?

Revision history for this message

Olivier Tilloy (osomon) wrote on 2011-09-07:

You are right, on second thought this ready() signal is probably not really useful, especially since its implementation is a tad clumsy.

Do we still want to merge the first revision of this branch (the backport from the oneiric branch)? Is there a way to have tarmac merge a selected revision only, or should I undo my last revision, or resubmit another merge request, or even merge it manually?

Revision history for this message

Florian Boucault (fboucault) wrote on 2011-09-08:

> You are right, on second thought this ready() signal is probably not really
> useful, especially since its implementation is a tad clumsy.
>
> Do we still want to merge the first revision of this branch (the backport from
> the oneiric branch)? Is there a way to have tarmac merge a selected revision
> only, or should I undo my last revision, or resubmit another merge request, or
> even merge it manually?

Just undoing your last revision is easiest.

lp://staging/~osomon/unity-2d/natty-panel-backport-oneiric-changes updated on 2011-09-09