unity-mir

Merge lp://qastaging/~alan-griffiths/unity-mir/dont-use-ApplicationSession into lp://qastaging/unity-mir

dont-use-ApplicationSession
Merge into trunk

Proposed by Alan Griffiths on 2013-11-14

Status:	Merged
Approved by:	Alan Griffiths on 2013-11-20
Approved revision:	144
Merged at revision:	147
Proposed branch:	lp://qastaging/~alan-griffiths/unity-mir/dont-use-ApplicationSession
Merge into:	lp://qastaging/unity-mir
Prerequisite:	lp://qastaging/~alan-griffiths/unity-mir/we-dont-need-SurfaceBuilder
Diff against target:	324 lines (+40/-42) 8 files modified src/modules/Unity/Application/application.cpp (+3/-3) src/modules/Unity/Application/application.h (+4/-4) src/modules/Unity/Application/application_manager.cpp (+8/-7) src/modules/Unity/Application/application_manager.h (+4/-5) src/modules/Unity/Application/mirsurfacemanager.cpp (+5/-2) src/modules/Unity/Application/mirsurfacemanager.h (+3/-3) src/unity-mir/sessionlistener.cpp (+8/-12) src/unity-mir/sessionlistener.h (+5/-6)
To merge this branch:	bzr merge lp://qastaging/~alan-griffiths/unity-mir/dont-use-ApplicationSession
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2013-11-14	Approve on 2013-11-20
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-20
Review via email: mp+195242@code.qastaging.launchpad.net

Commit message

ApplicationSession is a Mir implementation class that shouldn't be used by unity-mir, use shell::session instead

Description of the change

ApplicationSession is a Mir implementation class that shouldn't be used by unity-mir, use shell::session instead

NB this change is dependent on pending Mir changes (libmirserver-dev >= 0.1.1)

lp://qastaging/~alan-griffiths/unity-mir/dont-use-ApplicationSession updated on 2013-11-15

140. By Alan Griffiths on 2013-11-15: Don't use mir::shell::ApplicationSession
141. By Alan Griffiths on 2013-11-15: Don't use mir::shell::ApplicationSession or SessionManager
142. By Alan Griffiths on 2013-11-15: As in Rome...

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-17:

FAILED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/153/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/153/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2013-11-19:

I think you got everything :)

Please add explicit version dependence on libmirserver-dev to the debian/control file.

review: Needs Fixing

lp://qastaging/~alan-griffiths/unity-mir/dont-use-ApplicationSession updated on 2013-11-20

143. By Alan Griffiths on 2013-11-20: merge lp:unity-mir

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2013-11-20:

> I think you got everything :)
>
> Please add explicit version dependence on libmirserver-dev to the
> debian/control file.

I was relying on something like (it didn't exist when I proposed this) https://code.launchpad.net/~kgunn72/unity-mir/bump-mir-dep-0.1.1/+merge/193521 landing first - which it has. ;)

Merging current trunk in should address that.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-20:

PASSED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/158/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/158/rebuild

review: Approve (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2013-11-20:

Missed stuff:

src/unity-mir/sessionlistener.cpp:
qRegisterMetaType<std::shared_ptr<msh::Session>>("std::shared_ptr<mir::shell::ApplicationSession>");
would be best to keep the Qt Metatype name matching the actual type.

src/modules/Unity/Application/application_manager.h:
you could remove the "class ApplicationSession;" here too. I don't see it being referred to anywhere.

review: Needs Fixing

lp://qastaging/~alan-griffiths/unity-mir/dont-use-ApplicationSession updated on 2013-11-20