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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jason Smith (community) | Approve | ||
Review via email:
|
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 SoftwareCenterL
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.
You've made some of the bool methods const but not others. I think most of them could be const.