Merge lp:~muktupavels/lightdm/wayland-on-seat1-test into lp:lightdm

[Alberts Muktupāvels]

Unmerged revisions

2466. By Alberts Muktupāvels on 2017-02-05

Test...

=== modified file 'src/lightdm.c'
--- src/lightdm.c	2017-01-26 23:04:52 +0000
+++ src/lightdm.c	2017-02-05 16:48:56 +0000
@@ -455,9 +455,12 @@
 
     if (seat)
     {
+        gboolean can_multi_session = login1_seat_get_can_multi_session (login1_seat);
+
         set_seat_properties (seat, seat_name);
+        seat_set_can_multi_session (seat, can_multi_session);
 
-        if (!login1_seat_get_can_multi_session (login1_seat))
+        if (!can_multi_session)
         {
             g_debug ("Seat %s has property CanMultiSession=no", seat_name);
             /* XXX: uncomment this line after bug #1371250 is closed.
 
=== modified file 'src/seat.c'
--- src/seat.c	2016-12-09 00:31:30 +0000
+++ src/seat.c	2017-02-05 16:48:56 +0000
@@ -36,6 +36,9 @@
     /* Configuration for this seat */
     GHashTable *properties;
 
+    /* TRUE if CanMultiSession=no */
+    gboolean can_multi_session;
+
     /* TRUE if this seat can run multiple sessions at once */
     gboolean supports_multi_session;
 
@@ -187,6 +190,13 @@
 }
 
 void
+seat_set_can_multi_session (Seat *seat, gboolean can_multi_session)
+{
+    g_return_if_fail (seat != NULL);
+    seat->priv->can_multi_session = can_multi_session;
+}
+
+void
 seat_set_supports_multi_session (Seat *seat, gboolean supports_multi_session)
 {
     g_return_if_fail (seat != NULL);
@@ -439,7 +449,7 @@
 }
 
 static void
-display_server_stopped_cb (DisplayServer *display_server, Seat *seat)
+seat_stop_display_server (Seat *seat, DisplayServer *display_server, gboolean switch_to_greeter)
 {
     const gchar *script;
     GList *list, *link;
@@ -489,7 +499,7 @@
     }
     g_list_free_full (list, g_object_unref);
 
-    if (!seat->priv->stopping)
+    if (!seat->priv->stopping && switch_to_greeter)
     {
         /* If we were the active session, switch to a greeter */
         active_session = seat_get_active_session (seat);
@@ -507,6 +517,12 @@
     g_object_unref (display_server);
 }
 
+static void
+display_server_stopped_cb (DisplayServer *display_server, Seat *seat)
+{
+    seat_stop_display_server (seat, display_server, TRUE);
+}
+
 static gboolean
 can_share_display_server (Seat *seat, DisplayServer *display_server)
 {
@@ -1413,6 +1429,29 @@
     {
         if (session_get_is_authenticated (session))
         {
+            if (!seat->priv->can_multi_session)
+            {
+                GList *display_servers, *link;
+
+                l_debug (seat, "CanMultiSession=no, stopping existing display servers");
+                display_servers = g_list_copy (seat->priv->display_servers);
+
+                for (link = display_servers; link; link = link->next)
+                {
+                    DisplayServer *server = link->data;
+
+                    if (server == display_server)
+                        continue;
+
+                    g_signal_handlers_disconnect_matched (server, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat);
+                    display_server_stop (server);
+
+                    seat_stop_display_server (seat, server, FALSE);
+                }
+
+                g_list_free (display_servers);
+            }
+
             l_debug (seat, "Display server ready, running session");
             run_session (seat, session);
         }
 
=== modified file 'src/seat.h'
--- src/seat.h	2016-06-19 22:43:19 +0000
+++ src/seat.h	2017-02-05 16:48:56 +0000
@@ -79,6 +79,8 @@
 
 const gchar *seat_get_name (Seat *seat);
 
+void seat_set_can_multi_session (Seat *seat, gboolean can_multi_session);
+
 void seat_set_supports_multi_session (Seat *seat, gboolean supports_multi_session);
 
 void seat_set_share_display_server (Seat *seat, gboolean share_display_server);