Merge lp:~mterry/lightdm/upstart into lp:lightdm

[Michael Terry]

[Robert Ancell (robert-ancell)]

Feedback:
- It emits 'user-session-start' instead of 'desktop-session-start' as listed in lightdm.conf and the .pdf.
- It's probably easier to do this in seat.c and do this in the ready and session-started signal handlers.

I'm not sure what the exact point of the events are (will ask more in the bug).

review: Needs Fixing

[lp:~mterry/lightdm/upstart]

1070. By Michael Terry on 2011-08-30

move upstart signal emission to seat.c

[Michael Terry (mterry)]

Good catch on user-session-start.

I've updated this branch to fix that and move the code to seat.c. Please re-review.

[lp:~mterry/lightdm/upstart]

1071. By Michael Terry on 2011-08-30

merge from trunk

[Robert Ancell (robert-ancell)]

Not sure if they are in the right place, but I'll apply this for now and we can move them if they're not right.

review: Approve

=== modified file 'data/init/lightdm.conf'
--- data/init/lightdm.conf	2010-08-23 06:23:33 +0000
+++ data/init/lightdm.conf	2011-08-30 13:49:26 +0000
@@ -6,4 +6,7 @@
 description	"LightDM Display Manager"
 author		"Robert Ancell <[e-mail]>"
 
+emits login-session-start
+emits desktop-session-start
+
 exec /usr/bin/lightdm
 
=== modified file 'src/seat.c'
--- src/seat.c	2011-08-29 05:13:48 +0000
+++ src/seat.c	2011-08-30 13:49:26 +0000
@@ -335,6 +335,17 @@
 }
 
 static void
+emit_upstart_signal (const gchar *signal)
+{
+    g_return_if_fail (signal != NULL);
+    g_return_if_fail (signal[0] != 0);
+
+    gchar *cmd = g_strdup_printf ("/sbin/initctl -q emit %s DISPLAY_MANAGER=lightdm", signal);
+    g_spawn_command_line_async (cmd, NULL); /* OK if it fails, probably not installed */
+    g_free (cmd);
+}
+
+static void
 display_ready_cb (Display *display, Seat *seat)
 {
     const gchar *script;
@@ -346,6 +357,8 @@
 
     /* Switch to this new display */
     SEAT_GET_CLASS (seat)->set_active_display (seat, display);
+
+    emit_upstart_signal ("login-session-start");
 }
 
 static void
@@ -362,6 +375,12 @@
 }
 
 static void
+display_session_started_cb (Display *display, Seat *seat)
+{
+    emit_upstart_signal ("desktop-session-start");
+}
+
+static void
 display_session_stopped_cb (Display *display, Seat *seat)
 {
     Session *session;
@@ -456,6 +475,7 @@
     g_signal_connect (new_display, "get-guest-username", G_CALLBACK (display_get_guest_username_cb), seat);
     g_signal_connect (new_display, "ready", G_CALLBACK (display_ready_cb), seat);
     g_signal_connect (new_display, "session-created", G_CALLBACK (display_session_created_cb), seat);
+    g_signal_connect (new_display, "session-started", G_CALLBACK (display_session_started_cb), seat);
     g_signal_connect (new_display, "session-stopped", G_CALLBACK (display_session_stopped_cb), seat);
     g_signal_connect (new_display, "stopped", G_CALLBACK (display_stopped_cb), seat);
     display_set_greeter_session (new_display, seat_get_string_property (seat, "greeter-session"));