Light Display Manager

Merge lp:~robert-ancell/lightdm/usc-set-active into lp:lightdm

  1. usc-set-active
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Merged at revision: 1997
Proposed branch: lp:~robert-ancell/lightdm/usc-set-active
Merge into: lp:lightdm
Diff against target: 92 lines (+23/-1)
6 files modified
src/seat-xlocal.c (+8/-1)
tests/scripts/mir-autologin.conf (+3/-0)
tests/scripts/mir-greeter.conf (+3/-0)
tests/scripts/mir-session-compositor-crash.conf (+3/-0)
tests/scripts/mir-session-crash.conf (+3/-0)
tests/scripts/mir-session.conf (+3/-0)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/usc-set-active
Reviewer Review Type Date Requested Status
Robert Ancell Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+222117@code.launchpad.net

Commit message

Set active session in unity-system-compositor when running Mir sessions from VT switching seats. There was a behaviour change and the session is now only shown once this is set.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1997
http://jenkins.qa.ubuntu.com/job/lightdm-ci/300/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-utopic-armhf-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/300/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/seat-xlocal.c'
2--- src/seat-xlocal.c 2014-05-28 16:18:06 +0000
3+++ src/seat-xlocal.c 2014-06-05 03:32:26 +0000
4@@ -250,10 +250,17 @@
5 static void
6 seat_xlocal_set_active_session (Seat *seat, Session *session)
7 {
8- gint vt = display_server_get_vt (session_get_display_server (session));
9+ DisplayServer *display_server;
10+
11+ display_server = session_get_display_server (session);
12+
13+ gint vt = display_server_get_vt (display_server);
14 if (vt >= 0)
15 vt_set_active (vt);
16
17+ if (IS_UNITY_SYSTEM_COMPOSITOR (display_server))
18+ unity_system_compositor_set_active_session (UNITY_SYSTEM_COMPOSITOR (display_server), IS_GREETER (session) ? "greeter-0" : "session-0");
19+
20 SEAT_CLASS (seat_xlocal_parent_class)->set_active_session (seat, session);
21 }
22
23
24=== modified file 'tests/scripts/mir-autologin.conf'
25--- tests/scripts/mir-autologin.conf 2014-05-28 16:18:22 +0000
26+++ tests/scripts/mir-autologin.conf 2014-06-05 03:32:26 +0000
27@@ -17,6 +17,9 @@
28 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
29 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
30
31+# Session shown
32+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
33+
34 # Cleanup
35 #?*STOP-DAEMON
36 #?SESSION-MIR-session-0 TERMINATE SIGNAL=15
37
38=== modified file 'tests/scripts/mir-greeter.conf'
39--- tests/scripts/mir-greeter.conf 2014-05-28 16:18:22 +0000
40+++ tests/scripts/mir-greeter.conf 2014-06-05 03:32:26 +0000
41@@ -15,6 +15,9 @@
42 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON
43 #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
44
45+# Greeter shown
46+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=greeter-0
47+
48 # Cleanup
49 #?*STOP-DAEMON
50 #?GREETER-MIR-greeter-0 TERMINATE SIGNAL=15
51
52=== modified file 'tests/scripts/mir-session-compositor-crash.conf'
53--- tests/scripts/mir-session-compositor-crash.conf 2014-05-28 16:18:22 +0000
54+++ tests/scripts/mir-session-compositor-crash.conf 2014-06-05 03:32:26 +0000
55@@ -17,6 +17,9 @@
56 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
57 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
58
59+# Session shown
60+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
61+
62 # Crash system compositor
63 #?*UNITY-SYSTEM-COMPOSITOR CRASH
64
65
66=== modified file 'tests/scripts/mir-session-crash.conf'
67--- tests/scripts/mir-session-crash.conf 2014-05-28 16:18:22 +0000
68+++ tests/scripts/mir-session-crash.conf 2014-06-05 03:32:26 +0000
69@@ -17,6 +17,9 @@
70 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
71 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
72
73+# Session shown
74+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
75+
76 # Crash session
77 #?*SESSION-MIR-session-0 CRASH
78
79
80=== modified file 'tests/scripts/mir-session.conf'
81--- tests/scripts/mir-session.conf 2014-05-28 16:18:22 +0000
82+++ tests/scripts/mir-session.conf 2014-06-05 03:32:26 +0000
83@@ -44,6 +44,9 @@
84 #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=no-password1
85 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
86
87+# Session shown
88+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
89+
90 # Cleanup
91 #?*STOP-DAEMON
92 #?SESSION-MIR-session-0 TERMINATE SIGNAL=15

Subscribers

People subscribed via source and target branches