Merge lp://qastaging/~3v1n0/unity/bamflaunchericon-cleanups into lp://qastaging/unity

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 1893
Proposed branch: lp://qastaging/~3v1n0/unity/bamflaunchericon-cleanups
Merge into: lp://qastaging/unity
Diff against target: 2292 lines (+627/-835)
11 files modified
plugins/unityshell/src/AbstractLauncherIcon.h (+1/-1)
plugins/unityshell/src/BamfLauncherIcon.cpp (+488/-634)
plugins/unityshell/src/BamfLauncherIcon.h (+51/-75)
plugins/unityshell/src/Launcher.cpp (+2/-2)
plugins/unityshell/src/Launcher.h (+1/-1)
plugins/unityshell/src/LauncherController.cpp (+27/-25)
plugins/unityshell/src/LauncherIcon.cpp (+1/-1)
plugins/unityshell/src/LauncherIcon.h (+1/-1)
plugins/unityshell/src/MockLauncherIcon.h (+1/-1)
plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp (+43/-71)
plugins/unityshell/src/SoftwareCenterLauncherIcon.h (+11/-23)
To merge this branch: bzr merge lp://qastaging/~3v1n0/unity/bamflaunchericon-cleanups
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+89985@code.qastaging.launchpad.net

Description of the change

BamfLauncherIcon: a lot of code cleanup using more C++ friendly members to fix memory leaks and improve our work.

After holding this branch to wait the jason one to merge lp:~unity-team/unity/unity.multi-launcher, I've updated it including his changes.

I've also included some cleanups for the new SoftwareCenterLauncherIcon that depends on BamfLauncherIcon

Plus fixed the bug #921102 that was caused by the fact that the remote dbusmenu was unreferenced by the icon, and bug #925839 that was caused by the fact that after the multi-monitor branch, an icon was not redrawn on EnsureWindowState until there was a monitor / vp change, now we force the redraw.

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

You've made some of the bool methods const but not others. I think most of them could be const.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

> You've made some of the bool methods const but not others. I think most of
> them could be const.

Unfortunately they can't as they depend on the parent "GetQuirk" method that is not const, maybe we can fix them in their place by the way.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ok, I've merged and improved few things, now it's good for being reviewed! :)

Revision history for this message
Jason Smith (jassmith) wrote :

Works well enough. Now that tests are working again, +1

review: Approve

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.