Merge lp://staging/~ted/ubuntu-app-launch/non-blocking-resume into lp://staging/ubuntu-app-launch/touch-vivid

Proposed by Ted Gould
Status: Merged
Approved by: Michał Sawicz
Approved revision: 275
Merged at revision: 267
Proposed branch: lp://staging/~ted/ubuntu-app-launch/non-blocking-resume
Merge into: lp://staging/ubuntu-app-launch/touch-vivid
Diff against target: 470 lines (+158/-126)
6 files modified
libubuntu-app-launch/application-impl-base.cpp (+97/-75)
libubuntu-app-launch/application-impl-base.h (+15/-6)
libubuntu-app-launch/application-impl-libertine.cpp (+1/-2)
libubuntu-app-launch/registry-impl.cpp (+19/-26)
libubuntu-app-launch/snapd-info.cpp (+1/-1)
tests/libual-cpp-test.cc (+25/-16)
To merge this branch: bzr merge lp://staging/~ted/ubuntu-app-launch/non-blocking-resume
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Review via email: mp+310492@code.staging.launchpad.net

Commit message

Make resume/pause non-blocking

To post a comment you must log in.
274. By Ted Gould

Forgot to remove emit.h from the CMakeLists.txt

Revision history for this message
Michał Sawicz (saviq) wrote :
review: Needs Fixing
275. By Ted Gould

Make several functions static so that they don't depend on the object existing for their execution

Revision history for this message
Michał Sawicz (saviq) wrote :
review: Approve
Revision history for this message
Pat McGowan (pat-mcgowan) wrote :

Tested silo 2181 on an MX4 running proposed and it fixed the symptoms from lp:1637996

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