From 92432fcc7f3a0320c07e99c5d395568a3aa216b6 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Tue, 17 Sep 2013 17:39:59 +0200 Subject: logind: rename vtconsole to seat0 The seat->vtconsole member always points to the default seat seat0. Even if VTs are disabled, it's used as default seat. Therefore, rename it to seat0 to correctly state what it is. This also changes the seat files in /run from IS_VTCONSOLE to IS_SEAT0. It wasn't used by any code, yet, so this seems fine. While we are at it, we also remove every "if (s->vtconsole)" as this pointer is always valid! --- src/login/logind-seat.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/login/logind-seat.c') diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index 2c60b8ae51..9b6ceb31af 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.c @@ -105,11 +105,11 @@ int seat_save(Seat *s) { fprintf(f, "# This is private data. Do not parse.\n" - "IS_VTCONSOLE=%i\n" + "IS_SEAT0=%i\n" "CAN_MULTI_SESSION=%i\n" "CAN_TTY=%i\n" "CAN_GRAPHICAL=%i\n", - seat_is_vtconsole(s), + seat_is_seat0(s), seat_can_multi_session(s), seat_can_tty(s), seat_can_graphical(s)); @@ -424,16 +424,16 @@ int seat_attach_session(Seat *s, Session *session) { return 0; } -bool seat_is_vtconsole(Seat *s) { +bool seat_is_seat0(Seat *s) { assert(s); - return s->manager->vtconsole == s; + return s->manager->seat0 == s; } bool seat_can_multi_session(Seat *s) { assert(s); - if (!seat_is_vtconsole(s)) + if (!seat_is_seat0(s)) return false; /* If we can't watch which VT is in the foreground, we don't @@ -445,7 +445,7 @@ bool seat_can_multi_session(Seat *s) { bool seat_can_tty(Seat *s) { assert(s); - return seat_is_vtconsole(s); + return seat_is_seat0(s); } bool seat_has_master_device(Seat *s) { @@ -503,7 +503,7 @@ int seat_check_gc(Seat *s, bool drop_not_started) { if (drop_not_started && !s->started) return 0; - if (seat_is_vtconsole(s)) + if (seat_is_seat0(s)) return 1; return seat_has_master_device(s); -- cgit v1.2.3-54-g00ecf