shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

login: add 'mir' to the list of session types

Browse Source 
Add Mir to the list of session types. This is implemented for LightDM
in lp:~robert-ancell/lightdm/xdg-session-desktop [1].

[1] https://code.launchpad.net/~robert-ancell/lightdm/xdg-session-desktop/+merge/214108

(david: adjusted commit-header and fixed whitespace issues)
This commit is contained in:
David Herrmann 2014-04-09 21:22:48 +02:00
parent 13468826f2
commit 9541666b8d
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
man/pam_systemd.xml
View File

@ -145,8 +145,9 @@
variable takes precedence. One of variable takes precedence. One of
<literal>unspecified</literal>, <literal>unspecified</literal>,
<literal>tty</literal>, <literal>tty</literal>,
<literal>x11</literal> or <literal>x11</literal>,
<literal>wayland</literal>. See <literal>wayland</literal> or
<literal>mir</literal>. See
<citerefentry><refentrytitle>sd_session_get_type</refentrytitle><manvolnum>3</manvolnum></citerefentry> <citerefentry><refentrytitle>sd_session_get_type</refentrytitle><manvolnum>3</manvolnum></citerefentry>
for details about the session type.</para></listitem> for details about the session type.</para></listitem>
</varlistentry> </varlistentry>

6
man/sd_session_is_active.xml
View File

@ -201,9 +201,9 @@
be used to determine the type of the session be used to determine the type of the session
identified by the specified session identifier. The identified by the specified session identifier. The
returned string is one of <literal>x11</literal>, returned string is one of <literal>x11</literal>,
<literal>wayland</literal>, <literal>tty</literal> or <literal>wayland</literal>, <literal>tty</literal>,
<literal>unspecified</literal> and needs to be freed <literal>mir</literal> or <literal>unspecified</literal> and
with the libc needs to be freed with the libc
<citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry> <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
call after use.</para> call after use.</para>

1
src/login/logind-session.c
View File

@ -1117,6 +1117,7 @@ static const char* const session_type_table[_SESSION_TYPE_MAX] = {
[SESSION_TTY] = "tty", [SESSION_TTY] = "tty",
[SESSION_X11] = "x11", [SESSION_X11] = "x11",
[SESSION_WAYLAND] = "wayland", [SESSION_WAYLAND] = "wayland",
[SESSION_MIR] = "mir",
}; };
DEFINE_STRING_TABLE_LOOKUP(session_type, SessionType); DEFINE_STRING_TABLE_LOOKUP(session_type, SessionType);

1
src/login/logind-session.h
View File

@ -55,6 +55,7 @@ typedef enum SessionType {
SESSION_TTY, SESSION_TTY,
SESSION_X11, SESSION_X11,
SESSION_WAYLAND, SESSION_WAYLAND,
SESSION_MIR,
_SESSION_TYPE_MAX, _SESSION_TYPE_MAX,
_SESSION_TYPE_INVALID = -1 _SESSION_TYPE_INVALID = -1
} SessionType; } SessionType;

2
src/systemd/sd-login.h
View File

@ -138,7 +138,7 @@ int sd_session_get_seat(const char *session, char **seat);
/* Determine the (PAM) service name this session was registered by. */ /* Determine the (PAM) service name this session was registered by. */
int sd_session_get_service(const char *session, char **service); int sd_session_get_service(const char *session, char **service);
/* Determine the type of this session, i.e. one of "tty", "x11" or "unspecified". */ /* Determine the type of this session, i.e. one of "tty", "x11", "wayland", "mir" or "unspecified". */
int sd_session_get_type(const char *session, char **type); int sd_session_get_type(const char *session, char **type);
/* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */ /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */