lp:~robert-ancell/lightdm/mir-sessions

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:lightdm at revision 1741

PS Jenkins bot: Approve (continuous-integration) on 2013-07-30

Robert Ancell: Approve on 2013-07-29

Diff: 1939 lines (+984/-95)

45 files modified

.bzrignore (+1/-0)
doc/lightdm-gobject-1-sections.txt (+1/-0)
doc/tmpl/session.sgml (+9/-0)
liblightdm-gobject/lightdm/session.h (+2/-0)
liblightdm-gobject/session.c (+27/-1)
liblightdm-qt/QLightDM/sessionsmodel.h (+2/-1)
liblightdm-qt/sessionsmodel.cpp (+4/-0)
src/Makefile.am (+2/-0)
src/display-server.c (+7/-0)
src/display-server.h (+3/-0)
src/mir-server.c (+159/-0)
src/mir-server.h (+53/-0)
src/seat-unity.c (+64/-16)
src/seat-xdmcp-session.c (+4/-1)
src/seat-xlocal.c (+9/-3)
src/seat-xremote.c (+7/-1)
src/seat-xvnc.c (+6/-1)
src/seat.c (+77/-35)
src/seat.h (+2/-1)
src/session-config.c (+13/-0)
src/session-config.h (+1/-0)
src/session.c (+19/-0)
src/session.h (+4/-0)
src/x-server.c (+7/-0)
tests/Makefile.am (+50/-32)
tests/data/greeters/test-mir-greeter.desktop (+5/-0)
tests/data/sessions/mir.desktop (+5/-0)
tests/scripts/mir-autologin.conf (+32/-0)
tests/scripts/mir-greeter.conf (+10/-0)
tests/scripts/mir-session.conf (+34/-0)
tests/scripts/unity-mir-autologin.conf (+26/-0)
tests/scripts/unity-mir-greeter-mir-session.conf (+41/-0)
tests/scripts/unity-mir-greeter-x-session.conf (+52/-0)
tests/scripts/unity-mir-session-x-greeter.conf (+52/-0)
tests/src/Makefile.am (+14/-1)
tests/src/test-gobject-greeter.c (+10/-1)
tests/src/test-mir-greeter.c (+146/-0)
tests/src/test-session.c (+10/-1)
tests/test-mir-autologin (+2/-0)
tests/test-mir-greeter (+2/-0)
tests/test-mir-session (+2/-0)
tests/test-unity-mir-autologin (+2/-0)
tests/test-unity-mir-greeter-mir-session (+2/-0)
tests/test-unity-mir-greeter-x-session (+2/-0)
tests/test-unity-mir-session-x-greeter (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1660. By Robert Ancell on 2013-08-18

Merge with trunk

1659. By Robert Ancell on 2013-07-26

Fix distcheck

1658. By Robert Ancell on 2013-07-26

Test that trying to start a Mir session from a VT seat does the right thing

1657. By Robert Ancell on 2013-07-26

We can't run Mir servers on VT seats - they need to be root to work

1656. By Robert Ancell on 2013-07-26

It's not a warning to try and create an unsupported display server

1655. By Robert Ancell on 2013-07-26

Put guards around display_server_get_vt()

1654. By Robert Ancell on 2013-07-26

Add more Mir tests for Unity seat type

1653. By Robert Ancell on 2013-07-26

Merge with trunk

1652. By Robert Ancell on 2013-07-26

Fix distcheck

1651. By Robert Ancell on 2013-07-26

Merge with trunk