mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

logind: Remove session type check

Browse source
This commit is contained in:
Kenny Levinsen 2020-08-23 20:12:51 +02:00
parent 24c66d8c08
commit 8ab3fc03aa
1 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libseat/backend/logind.c
View file

@ -637,7 +637,6 @@ out:
static bool get_display_session(char **session_id) { static bool get_display_session(char **session_id) {
assert(session_id != NULL); assert(session_id != NULL);
char *xdg_session_id = getenv("XDG_SESSION_ID"); char *xdg_session_id = getenv("XDG_SESSION_ID");
char *type = NULL;
char *state = NULL; char *state = NULL;
if (xdg_session_id) { if (xdg_session_id) {
@ -669,17 +668,6 @@ static bool get_display_session(char **session_id) {
assert(*session_id != NULL); assert(*session_id != NULL);
// Check that the available session is graphical
ret = sd_session_get_type(*session_id, &type);
if (ret < 0) {
goto error;
}
const char *graphical_session_types[] = {"wayland", "x11", "mir", NULL};
if (!contains_str(type, graphical_session_types)) {
goto error;
}
// Check that the session is active // Check that the session is active
ret = sd_session_get_state(*session_id, &state); ret = sd_session_get_state(*session_id, &state);
if (ret < 0) { if (ret < 0) {
@ -691,12 +679,10 @@ static bool get_display_session(char **session_id) {
goto error; goto error;
} }
free(type);
free(state); free(state);
return true; return true;
error: error:
free(type);
free(state); free(state);
free(*session_id); free(*session_id);
*session_id = NULL; *session_id = NULL;