Merge lp:~mterry/unity/683735 into lp:unity
Proposed by
Michael Terry
Status: | Merged |
---|---|
Merge reported by: | Neil J. Patel |
Merged at revision: | not available |
Proposed branch: | lp:~mterry/unity/683735 |
Merge into: | lp:unity |
Diff against target: |
138 lines (+47/-4) 6 files modified
CMakeLists.txt (+1/-1) src/BamfLauncherIcon.cpp (+7/-3) src/PluginAdapter.cpp (+30/-0) src/PluginAdapter.h (+4/-0) src/SimpleLauncherIcon.cpp (+3/-0) src/TrashLauncherIcon.cpp (+2/-0) |
To merge this branch: | bzr merge lp:~mterry/unity/683735 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sam Spilsbury (community) | Approve | ||
Review via email: mp+42406@code.launchpad.net |
To post a comment you must log in.
Patch works nicely. Maybe it'd be good to check the scale action's state before calling terminate? It doesn't crash the way it is, but it would save a little bit of overhead.