Fix callbacks, now works (in theory)

diff --git a/src/display.c b/src/display.c
index f0de3f4c58d8aad3004b4feb258f37ac47e5bac1..f849a60e0a6e1f760de6bf0b0f44c6ada5fd130b 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -889,6 +889,7 @@ display_start_with_session (Display *display, Session *session)
     g_return_val_if_fail (session != NULL, FALSE);
 
     display->priv->session = g_object_ref (session);
+    g_signal_connect_after (display->priv->session, "stopped", G_CALLBACK (user_session_stopped_cb), display);
     session_set_display_server (session, display->priv->display_server);
 
     return display_start (display);

diff --git a/src/seat.c b/src/seat.c
index 8487428dbe7f67ef48ab74a4523d3692af80fe8c..77dbec6e2d87560660060687d1c47c724eac61f5 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -428,6 +428,7 @@ display_create_display_cb (Display *display, Session *session, Seat *seat)
     Display *d;
 
     d = create_display (seat);
+    g_signal_connect (d, "ready", G_CALLBACK (display_ready_cb), seat);
     g_signal_emit (seat, signals[DISPLAY_ADDED], 0, d);
 
     display_start_with_session (d, session);

diff --git a/tests/scripts/xserver-no-share.conf b/tests/scripts/xserver-no-share.conf
index 549d515da3c10d95cda3b7f531eb8f9652006812..c62fdf263cc5cf5cbbea3cd52bc5f5d50c3df186 100644 (file)
--- a/tests/scripts/xserver-no-share.conf
+++ b/tests/scripts/xserver-no-share.conf
@@ -39,6 +39,7 @@ xserver-share=false
 
 # Greeter stops
 #?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 
 # Cleanup
 #?*STOP-DAEMON