summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2014-08-27 15:19:27 +1200
committerRobert Ancell <robert.ancell@canonical.com>2014-08-27 15:19:27 +1200
commit661d200adada01373f6bb6a6c01ffdce83cbf8dc (patch)
tree50ebbf0e23c890b46088f46f0359d1fd2d84f7b9
parent07a479990f660dd059b308809f02e516b1db7d80 (diff)
downloadlightdm-661d200adada01373f6bb6a6c01ffdce83cbf8dc.tar.gz
Don't start any login1 seats if start-default-seat=false to match existing use-case
-rw-r--r--src/lightdm.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/lightdm.c b/src/lightdm.c
index 4ba17ce0..c5eb5c92 100644
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -1403,14 +1403,18 @@ main (int argc, char **argv)
{
/* Load dynamic seats from logind */
g_debug ("Monitoring logind for seats");
- g_signal_connect (login1_service_get_instance (), "seat-added", G_CALLBACK (login1_service_seat_added_cb), NULL);
- g_signal_connect (login1_service_get_instance (), "seat-removed", G_CALLBACK (login1_service_seat_removed_cb), NULL);
- for (link = login1_service_get_seats (login1_service_get_instance ()); link; link = link->next)
+ if (config_get_boolean (config_get_instance (), "LightDM", "start-default-seat"))
{
- Login1Seat *seat = link->data;
- if (!add_login1_seat (seat))
- return EXIT_FAILURE;
+ g_signal_connect (login1_service_get_instance (), "seat-added", G_CALLBACK (login1_service_seat_added_cb), NULL);
+ g_signal_connect (login1_service_get_instance (), "seat-removed", G_CALLBACK (login1_service_seat_removed_cb), NULL);
+
+ for (link = login1_service_get_seats (login1_service_get_instance ()); link; link = link->next)
+ {
+ Login1Seat *seat = link->data;
+ if (!add_login1_seat (seat))
+ return EXIT_FAILURE;
+ }
}
}
else