chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: rename vtconsole to seat0
[elogind.git]
/
src
/
login
/
logind-session.c
diff --git
a/src/login/logind-session.c
b/src/login/logind-session.c
index fe5fa27be11b161c4103cc2dcf201e8111c4757b..407429c48a11766ead16037c987eac55aa3056f7 100644
(file)
--- a/
src/login/logind-session.c
+++ b/
src/login/logind-session.c
@@
-360,8
+360,6
@@
int session_load(Session *s) {
}
int session_activate(Session *s) {
}
int session_activate(Session *s) {
- int r;
-
assert(s);
assert(s->user);
assert(s);
assert(s->user);
@@
-374,13
+372,9
@@
int session_activate(Session *s) {
if (s->seat->active == s)
return 0;
if (s->seat->active == s)
return 0;
- assert(seat_is_vtconsole(s->seat));
-
- r = chvt(s->vtnr);
- if (r < 0)
- return r;
+ assert(seat_is_seat0(s->seat));
- return
seat_set_active(s->seat, s
);
+ return
chvt(s->vtnr
);
}
static int session_link_x11_socket(Session *s) {
}
static int session_link_x11_socket(Session *s) {