Merge lp://qastaging/~gerboland/unity-mir/surface-notifications into lp://qastaging/unity-mir

Proposed by Gerry Boland
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 25
Merged at revision: 23
Proposed branch: lp://qastaging/~gerboland/unity-mir/surface-notifications
Merge into: lp://qastaging/unity-mir
Diff against target: 595 lines (+147/-118)
12 files modified
src/modules/Unity/ApplicationManager/application_list_model.cpp (+9/-2)
src/modules/Unity/ApplicationManager/application_list_model.h (+1/-0)
src/modules/Unity/ApplicationManager/application_manager.cpp (+33/-14)
src/modules/Unity/ApplicationManager/application_manager.h (+8/-1)
src/modules/Unity/SurfaceManager/mirsurface.cpp (+45/-86)
src/modules/Unity/SurfaceManager/mirsurface.h (+4/-2)
src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp (+23/-4)
src/modules/Unity/SurfaceManager/mirsurfacemanager.h (+4/-3)
src/unity-mir/sessionlistener.cpp (+14/-0)
src/unity-mir/sessionlistener.h (+6/-3)
src/unity-mir/surfacesource.cpp (+0/-2)
src/unity-mir/surfacesource.h (+0/-1)
To merge this branch: bzr merge lp://qastaging/~gerboland/unity-mir/surface-notifications
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Review via email: mp+176719@code.qastaging.launchpad.net

Commit message

Update SurfaceManager and ApplicationManager to make use of new MIR API, which notifies of surface creation and destruction per session/application.

Description of the change

Update SurfaceManager and ApplicationManager to make use of new MIR API, which notifies of surface creation and destruction per session/application.

To post a comment you must log in.
22. By Gerry Boland

Unset mainStageFocusedApplication if it is closed

23. By Gerry Boland

Merge trunk

24. By Gerry Boland

Reset mainStageFocusedApplication in stopProcess, fix crash on app close

25. By Gerry Boland

SurfaceManager: unable to keep msh::Surface as long as we want, so simplify API for now

Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good

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.

Subscribers

People subscribed via source and target branches