summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-04-17 13:57:40 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-04-17 16:15:30 +0200
commit8f8cc84ba4612e74cd1e26898c6816e6e60fc4e9 (patch)
tree6b6de54cbdc1a853a6ddb0ce7c4d2492945973c7 /src/login
parenta8cff0034c8271e0042ce6116fd45b5405ae4de3 (diff)
downloadsystemd-8f8cc84ba4612e74cd1e26898c6816e6e60fc4e9.tar.gz
sd-login: get rid of seat_can_multi_session()
Follow-up for fa2cf64a917d31605d40d34e98ce9e2e066064fa. Backwards-compat is retained. A short note is added in docs, in case people see sd_seat_can_multi_session() mentioned somewhere and wonder what happened to it. Also see https://github.com/systemd/systemd/pull/15337#issuecomment-610369404.
Diffstat (limited to 'src/login')
-rw-r--r--src/login/logind-seat-dbus.c4
-rw-r--r--src/login/logind-seat.c10
-rw-r--r--src/login/logind-seat.h1
3 files changed, 3 insertions, 12 deletions
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 0a5df937cc..15d4a25a92 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -17,7 +17,7 @@
#include "user-util.h"
#include "util.h"
-static BUS_DEFINE_PROPERTY_GET(property_get_can_multi_session, "b", Seat, seat_can_multi_session);
+static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_const_true, "b", true);
static BUS_DEFINE_PROPERTY_GET(property_get_can_tty, "b", Seat, seat_can_tty);
static BUS_DEFINE_PROPERTY_GET(property_get_can_graphical, "b", Seat, seat_can_graphical);
@@ -296,7 +296,7 @@ const sd_bus_vtable seat_vtable[] = {
SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Seat, id), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("ActiveSession", "(so)", property_get_active_session, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
- SD_BUS_PROPERTY("CanMultiSession", "b", property_get_can_multi_session, 0, SD_BUS_VTABLE_PROPERTY_CONST),
+ SD_BUS_PROPERTY("CanMultiSession", "b", property_get_const_true, 0, SD_BUS_VTABLE_PROPERTY_CONST|SD_BUS_VTABLE_HIDDEN),
SD_BUS_PROPERTY("CanTTY", "b", property_get_can_tty, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("CanGraphical", "b", property_get_can_graphical, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, 0),
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 4d51a326a2..157fc9423c 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -104,11 +104,10 @@ int seat_save(Seat *s) {
fprintf(f,
"# This is private data. Do not parse.\n"
"IS_SEAT0=%i\n"
- "CAN_MULTI_SESSION=%i\n"
+ "CAN_MULTI_SESSION=1\n"
"CAN_TTY=%i\n"
"CAN_GRAPHICAL=%i\n",
seat_is_seat0(s),
- seat_can_multi_session(s),
seat_can_tty(s),
seat_can_graphical(s));
@@ -558,13 +557,6 @@ bool seat_is_seat0(Seat *s) {
return s->manager->seat0 == s;
}
-bool seat_can_multi_session(Seat *s) {
- assert(s);
-
- /* multiple sessions are supported on all seats now */
- return true;
-}
-
bool seat_can_tty(Seat *s) {
assert(s);
diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h
index 64cdf2f25a..f4b57ce8d2 100644
--- a/src/login/logind-seat.h
+++ b/src/login/logind-seat.h
@@ -51,7 +51,6 @@ void seat_claim_position(Seat *s, Session *session, unsigned pos);
bool seat_has_vts(Seat *s);
bool seat_is_seat0(Seat *s);
-bool seat_can_multi_session(Seat *s);
bool seat_can_tty(Seat *s);
bool seat_has_master_device(Seat *s);
bool seat_can_graphical(Seat *s);