File lightdm-set-xdg-session-class.patch of Package lightdm
# HG changeset patch
# Parent 17d905104b27f1c6d10ce23d0d7fc40edc566198
Correctly set $XDG_SESSION_CLASS for greeters. This was regressed in 1.7.5 for ConsoleKit and was never passed to logind.
diff --git a/src/seat.c b/src/seat.c
--- a/src/seat.c
+++ b/src/seat.c
@@ -1079,6 +1079,7 @@ create_greeter_session (Seat *seat)
g_signal_connect (greeter_session, "stopped", G_CALLBACK (session_stopped_cb), seat);
set_session_env (SESSION (greeter_session));
+ session_set_env (SESSION (greeter_session), "XDG_SESSION_CLASS", XDG_SESSION_CLASS_GREETER);
session_set_pam_service (SESSION (greeter_session), GREETER_SERVICE);
if (getuid () == 0)
diff --git a/src/session-child.c b/src/session-child.c
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -215,7 +215,6 @@ session_child_run (int argc, char **argv
gchar *authentication_result_string;
gchar *service;
gchar *username;
- gchar *class;
gchar *tty;
gchar *remote_host_name;
gchar *xdisplay;
@@ -286,7 +285,7 @@ session_child_run (int argc, char **argv
username = read_string ();
read_data (&do_authenticate, sizeof (do_authenticate));
read_data (&is_interactive, sizeof (is_interactive));
- class = read_string ();
+ read_string (); /* Used to be class, now we just use the environment variable */
tty = read_string ();
remote_host_name = read_string ();
xdisplay = read_string ();
@@ -482,7 +481,7 @@ session_child_run (int argc, char **argv
g_variant_builder_init (&ck_parameters, G_VARIANT_TYPE ("(a(sv))"));
g_variant_builder_open (&ck_parameters, G_VARIANT_TYPE ("a(sv)"));
g_variant_builder_add (&ck_parameters, "(sv)", "unix-user", g_variant_new_int32 (user_get_uid (user)));
- if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) == 0)
+ if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), XDG_SESSION_CLASS_GREETER) == 0)
g_variant_builder_add (&ck_parameters, "(sv)", "session-type", g_variant_new_string ("LoginWindow"));
if (xdisplay)
{
@@ -601,7 +600,7 @@ session_child_run (int argc, char **argv
{
#if 0
/* Log to utmp */
- if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0)
+ if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), XDG_SESSION_CLASS_GREETER) != 0)
{
struct utmpx ut;
struct timeval tv;
@@ -632,7 +631,7 @@ session_child_run (int argc, char **argv
child_pid = 0;
#if 0
/* Log to utmp */
- if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0)
+ if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), XDG_SESSION_CLASS_GREETER) != 0)
{
struct utmpx ut;
struct timeval tv;
diff --git a/src/session.c b/src/session.c
--- a/src/session.c
+++ b/src/session.c
@@ -84,9 +84,6 @@ struct SessionPrivate
/* File to log to */
gchar *log_filename;
- /* Seat class */
- gchar *class;
-
/* tty this session is running on */
gchar *tty;
@@ -200,14 +197,6 @@ session_set_log_file (Session *session,
}
void
-session_set_class (Session *session, const gchar *class)
-{
- g_return_if_fail (session != NULL);
- g_free (session->priv->class);
- session->priv->class = g_strdup (class);
-}
-
-void
session_set_display_server (Session *session, DisplayServer *display_server)
{
g_return_if_fail (session != NULL);
@@ -615,7 +604,7 @@ session_real_start (Session *session)
write_string (session, session->priv->username);
write_data (session, &session->priv->do_authenticate, sizeof (session->priv->do_authenticate));
write_data (session, &session->priv->is_interactive, sizeof (session->priv->is_interactive));
- write_string (session, session->priv->class);
+ write_string (session, NULL); /* Used to be class, now we just use the environment variable */
write_string (session, session->priv->tty);
write_string (session, session->priv->remote_host_name);
write_string (session, session->priv->xdisplay);
@@ -874,7 +863,6 @@ session_finalize (GObject *object)
g_free (self->priv->messages);
g_free (self->priv->authentication_result_string);
g_free (self->priv->log_filename);
- g_free (self->priv->class);
g_free (self->priv->tty);
g_free (self->priv->xdisplay);
if (self->priv->x_authority)
diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf
--- a/tests/scripts/autologin-guest-fail-setup-script.conf
+++ b/tests/scripts/autologin-guest-fail-setup-script.conf
@@ -22,7 +22,7 @@ user-session=default
# (guest account attempts to start and fails)
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf
--- a/tests/scripts/autologin-guest-in-background.conf
+++ b/tests/scripts/autologin-guest-in-background.conf
@@ -17,7 +17,7 @@ user-session=default
#?*XSERVER-0 INDICATE-READY
#?XSERVER-0 INDICATE-READY
#?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -45,7 +45,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf
--- a/tests/scripts/autologin-guest-timeout.conf
+++ b/tests/scripts/autologin-guest-timeout.conf
@@ -21,7 +21,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf
--- a/tests/scripts/autologin-in-background.conf
+++ b/tests/scripts/autologin-in-background.conf
@@ -14,7 +14,7 @@ user-session=default
#?*XSERVER-0 INDICATE-READY
#?XSERVER-0 INDICATE-READY
#?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf
--- a/tests/scripts/autologin-invalid-session.conf
+++ b/tests/scripts/autologin-invalid-session.conf
@@ -19,7 +19,7 @@ user-session=invalid
# (session fails to start)
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf
--- a/tests/scripts/autologin-invalid-user.conf
+++ b/tests/scripts/autologin-invalid-user.conf
@@ -18,7 +18,7 @@ autologin-user=invalid
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -36,7 +36,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf
--- a/tests/scripts/autologin-new-authtok.conf
+++ b/tests/scripts/autologin-new-authtok.conf
@@ -19,7 +19,7 @@ user-session=default
# (Session fails)
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf
--- a/tests/scripts/autologin-password.conf
+++ b/tests/scripts/autologin-password.conf
@@ -19,7 +19,7 @@ user-session=default
# (Session fails)
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf
--- a/tests/scripts/autologin-session-crash.conf
+++ b/tests/scripts/autologin-session-crash.conf
@@ -36,7 +36,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf
--- a/tests/scripts/autologin-session-error.conf
+++ b/tests/scripts/autologin-session-error.conf
@@ -30,7 +30,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf
--- a/tests/scripts/autologin-timeout-in-background.conf
+++ b/tests/scripts/autologin-timeout-in-background.conf
@@ -15,7 +15,7 @@ user-session=default
#?*XSERVER-0 INDICATE-READY
#?XSERVER-0 INDICATE-READY
#?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf
--- a/tests/scripts/autologin-timeout.conf
+++ b/tests/scripts/autologin-timeout.conf
@@ -18,7 +18,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -34,7 +34,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cancel-authentication.conf b/tests/scripts/cancel-authentication.conf
--- a/tests/scripts/cancel-authentication.conf
+++ b/tests/scripts/cancel-authentication.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf
--- a/tests/scripts/change-authentication.conf
+++ b/tests/scripts/change-authentication.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf
--- a/tests/scripts/crash-authenticate.conf
+++ b/tests/scripts/crash-authenticate.conf
@@ -19,7 +19,7 @@ user-session=default
# (authentication crashes)
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf
--- a/tests/scripts/cred-error.conf
+++ b/tests/scripts/cred-error.conf
@@ -30,7 +30,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf
--- a/tests/scripts/cred-expired.conf
+++ b/tests/scripts/cred-expired.conf
@@ -30,7 +30,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf
--- a/tests/scripts/cred-unavail.conf
+++ b/tests/scripts/cred-unavail.conf
@@ -30,7 +30,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/dbus.conf b/tests/scripts/dbus.conf
--- a/tests/scripts/dbus.conf
+++ b/tests/scripts/dbus.conf
@@ -16,7 +16,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf
--- a/tests/scripts/denied.conf
+++ b/tests/scripts/denied.conf
@@ -19,7 +19,7 @@ user-session=default
# (Session fails)
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf
--- a/tests/scripts/expired.conf
+++ b/tests/scripts/expired.conf
@@ -19,7 +19,7 @@ user-session=default
# (Session fails)
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-allow-guest.conf b/tests/scripts/greeter-allow-guest.conf
--- a/tests/scripts/greeter-allow-guest.conf
+++ b/tests/scripts/greeter-allow-guest.conf
@@ -16,7 +16,7 @@ greeter-allow-guest=false
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-default-session.conf b/tests/scripts/greeter-default-session.conf
--- a/tests/scripts/greeter-default-session.conf
+++ b/tests/scripts/greeter-default-session.conf
@@ -16,7 +16,7 @@ user-session=alternative
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf
--- a/tests/scripts/greeter-fail-start.conf
+++ b/tests/scripts/greeter-fail-start.conf
@@ -16,7 +16,7 @@ return-value=1
#?XSERVER-0 ACCEPT-CONNECT
# Greeter fails to start
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?GREETER-X-0 EXIT CODE=1
# X server stopped
diff --git a/tests/scripts/greeter-hide-users.conf b/tests/scripts/greeter-hide-users.conf
--- a/tests/scripts/greeter-hide-users.conf
+++ b/tests/scripts/greeter-hide-users.conf
@@ -16,7 +16,7 @@ greeter-hide-users=true
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-show-manual-login.conf b/tests/scripts/greeter-show-manual-login.conf
--- a/tests/scripts/greeter-show-manual-login.conf
+++ b/tests/scripts/greeter-show-manual-login.conf
@@ -16,7 +16,7 @@ greeter-show-manual-login=true
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-show-remote-login.conf b/tests/scripts/greeter-show-remote-login.conf
--- a/tests/scripts/greeter-show-remote-login.conf
+++ b/tests/scripts/greeter-show-remote-login.conf
@@ -16,7 +16,7 @@ greeter-show-remote-login=false
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-wrapper.conf b/tests/scripts/greeter-wrapper.conf
--- a/tests/scripts/greeter-wrapper.conf
+++ b/tests/scripts/greeter-wrapper.conf
@@ -19,7 +19,7 @@ greeter-wrapper=test-greeter-wrapper
#?GREETER-WRAPPER-X-0 START
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf
--- a/tests/scripts/greeter-xserver-crash.conf
+++ b/tests/scripts/greeter-xserver-crash.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
@@ -34,7 +34,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/keyboard-layout.conf b/tests/scripts/keyboard-layout.conf
--- a/tests/scripts/keyboard-layout.conf
+++ b/tests/scripts/keyboard-layout.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/language-no-accounts-service.conf b/tests/scripts/language-no-accounts-service.conf
--- a/tests/scripts/language-no-accounts-service.conf
+++ b/tests/scripts/language-no-accounts-service.conf
@@ -16,7 +16,7 @@ disable-accounts-service=true
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf
--- a/tests/scripts/language.conf
+++ b/tests/scripts/language.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat-console-kit.conf b/tests/scripts/lock-seat-console-kit.conf
--- a/tests/scripts/lock-seat-console-kit.conf
+++ b/tests/scripts/lock-seat-console-kit.conf
@@ -40,7 +40,7 @@ user-session=default
#?CONSOLE-KIT LOCK-SESSION
# Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat-return-session-console-kit.conf b/tests/scripts/lock-seat-return-session-console-kit.conf
--- a/tests/scripts/lock-seat-return-session-console-kit.conf
+++ b/tests/scripts/lock-seat-return-session-console-kit.conf
@@ -40,7 +40,7 @@ user-session=default
#?CONSOLE-KIT LOCK-SESSION
# Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf
--- a/tests/scripts/lock-seat-return-session.conf
+++ b/tests/scripts/lock-seat-return-session.conf
@@ -37,7 +37,7 @@ user-session=default
#?LOGIN1 LOCK-SESSION
# Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf
--- a/tests/scripts/lock-seat.conf
+++ b/tests/scripts/lock-seat.conf
@@ -37,7 +37,7 @@ user-session=default
#?LOGIN1 LOCK-SESSION
# Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf
--- a/tests/scripts/lock-session-no-password.conf
+++ b/tests/scripts/lock-session-no-password.conf
@@ -37,7 +37,7 @@ user-session=default
#?LOGIN1 LOCK-SESSION
# Greeter starts with session user selected
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf
--- a/tests/scripts/lock-session-return-session.conf
+++ b/tests/scripts/lock-session-return-session.conf
@@ -34,7 +34,7 @@ user-session=default
#?XSERVER-1 ACCEPT-CONNECT
# Greeter starts with session user selected
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf
--- a/tests/scripts/lock-session.conf
+++ b/tests/scripts/lock-session.conf
@@ -37,7 +37,7 @@ user-session=default
#?LOGIN1 LOCK-SESSION
# Greeter starts with session user selected
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-crash-authenticate.conf b/tests/scripts/login-crash-authenticate.conf
--- a/tests/scripts/login-crash-authenticate.conf
+++ b/tests/scripts/login-crash-authenticate.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf
--- a/tests/scripts/login-guest-disabled.conf
+++ b/tests/scripts/login-guest-disabled.conf
@@ -16,7 +16,7 @@ allow-guest=false
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf
--- a/tests/scripts/login-guest-fail-setup-script.conf
+++ b/tests/scripts/login-guest-fail-setup-script.conf
@@ -19,7 +19,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
@@ -34,7 +34,7 @@ user-session=default
# (guest account attempts to start and fails)
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -19,7 +19,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
@@ -57,7 +57,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-no-setup-script.conf b/tests/scripts/login-guest-no-setup-script.conf
--- a/tests/scripts/login-guest-no-setup-script.conf
+++ b/tests/scripts/login-guest-no-setup-script.conf
@@ -16,7 +16,7 @@ guest-account-script=
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -19,7 +19,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-info-prompt.conf b/tests/scripts/login-info-prompt.conf
--- a/tests/scripts/login-info-prompt.conf
+++ b/tests/scripts/login-info-prompt.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf
--- a/tests/scripts/login-invalid-session.conf
+++ b/tests/scripts/login-invalid-session.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf
--- a/tests/scripts/login-invalid-user.conf
+++ b/tests/scripts/login-invalid-user.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf
--- a/tests/scripts/login-logout.conf
+++ b/tests/scripts/login-logout.conf
@@ -16,7 +16,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
@@ -50,7 +50,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-long-password.conf b/tests/scripts/login-long-password.conf
--- a/tests/scripts/login-long-password.conf
+++ b/tests/scripts/login-long-password.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-long-username.conf b/tests/scripts/login-long-username.conf
--- a/tests/scripts/login-long-username.conf
+++ b/tests/scripts/login-long-username.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf
--- a/tests/scripts/login-manual-previous-session.conf
+++ b/tests/scripts/login-manual-previous-session.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -16,7 +16,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-multi-info-prompt.conf b/tests/scripts/login-multi-info-prompt.conf
--- a/tests/scripts/login-multi-info-prompt.conf
+++ b/tests/scripts/login-multi-info-prompt.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-multi-prompt.conf b/tests/scripts/login-multi-prompt.conf
--- a/tests/scripts/login-multi-prompt.conf
+++ b/tests/scripts/login-multi-prompt.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf
--- a/tests/scripts/login-new-authtok.conf
+++ b/tests/scripts/login-new-authtok.conf
@@ -16,7 +16,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf
--- a/tests/scripts/login-no-password.conf
+++ b/tests/scripts/login-no-password.conf
@@ -16,7 +16,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf
@@ -16,7 +16,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf
--- a/tests/scripts/login-pick-session.conf
+++ b/tests/scripts/login-pick-session.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf
--- a/tests/scripts/login-previous-session.conf
+++ b/tests/scripts/login-previous-session.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-remember-session.conf b/tests/scripts/login-remember-session.conf
--- a/tests/scripts/login-remember-session.conf
+++ b/tests/scripts/login-remember-session.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
@@ -45,7 +45,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf
--- a/tests/scripts/login-remote-session.conf
+++ b/tests/scripts/login-remote-session.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -16,7 +16,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
@@ -50,7 +50,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-two-factor.conf b/tests/scripts/login-two-factor.conf
--- a/tests/scripts/login-two-factor.conf
+++ b/tests/scripts/login-two-factor.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf
--- a/tests/scripts/login-wrong-password.conf
+++ b/tests/scripts/login-wrong-password.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf
--- a/tests/scripts/login-xserver-crash.conf
+++ b/tests/scripts/login-xserver-crash.conf
@@ -16,7 +16,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
@@ -48,7 +48,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf
--- a/tests/scripts/login.conf
+++ b/tests/scripts/login.conf
@@ -16,7 +16,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/mir-autologin.conf b/tests/scripts/mir-autologin.conf
--- a/tests/scripts/mir-autologin.conf
+++ b/tests/scripts/mir-autologin.conf
@@ -19,7 +19,7 @@ user-session=mir
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/mir-session.conf b/tests/scripts/mir-session.conf
--- a/tests/scripts/mir-session.conf
+++ b/tests/scripts/mir-session.conf
@@ -16,7 +16,7 @@ user-session=mir
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf
--- a/tests/scripts/no-config.conf
+++ b/tests/scripts/no-config.conf
@@ -16,7 +16,7 @@ have-config=false
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/no-keyboard-layout.conf b/tests/scripts/no-keyboard-layout.conf
--- a/tests/scripts/no-keyboard-layout.conf
+++ b/tests/scripts/no-keyboard-layout.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/no-language.conf b/tests/scripts/no-language.conf
--- a/tests/scripts/no-language.conf
+++ b/tests/scripts/no-language.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf
--- a/tests/scripts/open-file-descriptors.conf
+++ b/tests/scripts/open-file-descriptors.conf
@@ -17,7 +17,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/plymouth-active-vt.conf b/tests/scripts/plymouth-active-vt.conf
--- a/tests/scripts/plymouth-active-vt.conf
+++ b/tests/scripts/plymouth-active-vt.conf
@@ -26,7 +26,7 @@ active=true
#?PLYMOUTH QUIT RETAIN-SPLASH=TRUE
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf
--- a/tests/scripts/plymouth-inactive-vt.conf
+++ b/tests/scripts/plymouth-inactive-vt.conf
@@ -20,7 +20,7 @@ active=true
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf
--- a/tests/scripts/power-no-console-kit.conf
+++ b/tests/scripts/power-no-console-kit.conf
@@ -16,7 +16,7 @@ disable-console-kit=true
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power-no-login1.conf b/tests/scripts/power-no-login1.conf
--- a/tests/scripts/power-no-login1.conf
+++ b/tests/scripts/power-no-login1.conf
@@ -16,7 +16,7 @@ disable-login1=true
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power-no-services.conf b/tests/scripts/power-no-services.conf
--- a/tests/scripts/power-no-services.conf
+++ b/tests/scripts/power-no-services.conf
@@ -18,7 +18,7 @@ disable-login1=true
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power.conf b/tests/scripts/power.conf
--- a/tests/scripts/power.conf
+++ b/tests/scripts/power.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf
--- a/tests/scripts/restart-authentication.conf
+++ b/tests/scripts/restart-authentication.conf
@@ -13,7 +13,7 @@
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf
--- a/tests/scripts/script-hook-fail-session-setup.conf
+++ b/tests/scripts/script-hook-fail-session-setup.conf
@@ -21,7 +21,7 @@ user-session=default
#?SCRIPT-HOOK SESSION-SETUP
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -51,7 +51,7 @@ user-session=default
#?SCRIPT-HOOK GREETER-SETUP
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf
--- a/tests/scripts/session-stderr-backup.conf
+++ b/tests/scripts/session-stderr-backup.conf
@@ -33,7 +33,7 @@ user-session=default
#?*XSERVER-0 INDICATE-READY
#?XSERVER-0 INDICATE-READY
#?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
@@ -62,7 +62,7 @@ user-session=default
#?*XSERVER-0 INDICATE-READY
#?XSERVER-0 INDICATE-READY
#?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf
--- a/tests/scripts/switch-to-greeter-new-session.conf
+++ b/tests/scripts/switch-to-greeter-new-session.conf
@@ -37,7 +37,7 @@ user-session=default
#?LOGIN1 LOCK-SESSION
# Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf
--- a/tests/scripts/switch-to-greeter-return-session-logout.conf
+++ b/tests/scripts/switch-to-greeter-return-session-logout.conf
@@ -37,7 +37,7 @@ user-session=default
#?LOGIN1 LOCK-SESSION
# Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
@@ -74,7 +74,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf
--- a/tests/scripts/switch-to-greeter-return-session.conf
+++ b/tests/scripts/switch-to-greeter-return-session.conf
@@ -37,7 +37,7 @@ user-session=default
#?LOGIN1 LOCK-SESSION
# Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf
--- a/tests/scripts/switch-to-greeter.conf
+++ b/tests/scripts/switch-to-greeter.conf
@@ -37,7 +37,7 @@ user-session=default
#?LOGIN1 LOCK-SESSION
# Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-user-existing.conf b/tests/scripts/switch-to-user-existing.conf
--- a/tests/scripts/switch-to-user-existing.conf
+++ b/tests/scripts/switch-to-user-existing.conf
@@ -58,7 +58,7 @@ user-session=default
#?XSERVER-2 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=9
+#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_SESSION_CLASS=greeter
#?XSERVER-2 ACCEPT-CONNECT
#?GREETER-X-2 CONNECT-XSERVER
#?GREETER-X-2 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-user-logout-active.conf b/tests/scripts/switch-to-user-logout-active.conf
--- a/tests/scripts/switch-to-user-logout-active.conf
+++ b/tests/scripts/switch-to-user-logout-active.conf
@@ -58,7 +58,7 @@ user-session=default
#?XSERVER-1 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -38,7 +38,7 @@ user-session=default
#?LOGIN1 LOCK-SESSION
# Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf
--- a/tests/scripts/unity-compositor-command.conf
+++ b/tests/scripts/unity-compositor-command.conf
@@ -22,7 +22,7 @@ unity-compositor-command=unity-system-co
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-fail-ready.conf b/tests/scripts/unity-compositor-fail-ready.conf
--- a/tests/scripts/unity-compositor-fail-ready.conf
+++ b/tests/scripts/unity-compositor-fail-ready.conf
@@ -23,7 +23,7 @@ unity-compositor-timeout=1
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-fail-start.conf b/tests/scripts/unity-compositor-fail-start.conf
--- a/tests/scripts/unity-compositor-fail-start.conf
+++ b/tests/scripts/unity-compositor-fail-start.conf
@@ -23,7 +23,7 @@ type=unity
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf
--- a/tests/scripts/unity-compositor-next-session.conf
+++ b/tests/scripts/unity-compositor-next-session.conf
@@ -19,7 +19,7 @@ autologin-in-background=true
#?*XSERVER-0 INDICATE-READY
#?XSERVER-0 INDICATE-READY
#?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf
--- a/tests/scripts/unity-login.conf
+++ b/tests/scripts/unity-login.conf
@@ -21,7 +21,7 @@ user-session=default
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-mir-greeter-mir-session.conf b/tests/scripts/unity-mir-greeter-mir-session.conf
--- a/tests/scripts/unity-mir-greeter-mir-session.conf
+++ b/tests/scripts/unity-mir-greeter-mir-session.conf
@@ -13,7 +13,7 @@ user-session=mir
#?*UNITY-SYSTEM-COMPOSITOR READY
# Greeter starts
-#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?GREETER-MIR-0 CONNECT-TO-DAEMON
#?GREETER-MIR-0 CONNECTED-TO-DAEMON
diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf
--- a/tests/scripts/unity-mir-greeter-x-session.conf
+++ b/tests/scripts/unity-mir-greeter-x-session.conf
@@ -13,7 +13,7 @@ user-session=default
#?*UNITY-SYSTEM-COMPOSITOR READY
# Greeter starts
-#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?GREETER-MIR-0 CONNECT-TO-DAEMON
#?GREETER-MIR-0 CONNECTED-TO-DAEMON
diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf
--- a/tests/scripts/unity-mir-session-x-greeter.conf
+++ b/tests/scripts/unity-mir-session-x-greeter.conf
@@ -21,7 +21,7 @@ user-session=mir
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -45,7 +45,7 @@ user-session=default
#?LOGIN1 LOCK-SESSION
# Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-1 ACCEPT-CONNECT
#?GREETER-X-1 CONNECT-XSERVER
#?GREETER-X-1 CONNECT-TO-DAEMON
@@ -78,7 +78,7 @@ user-session=default
#?XSERVER-2 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-2 ACCEPT-CONNECT
#?GREETER-X-2 CONNECT-XSERVER
#?GREETER-X-2 CONNECT-TO-DAEMON
diff --git a/tests/scripts/upstart-login.conf b/tests/scripts/upstart-login.conf
--- a/tests/scripts/upstart-login.conf
+++ b/tests/scripts/upstart-login.conf
@@ -21,7 +21,7 @@ report-events=true
#?INIT -q emit login-session-start DISPLAY_MANAGER=lightdm
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf
--- a/tests/scripts/user-renamed-invalid.conf
+++ b/tests/scripts/user-renamed-invalid.conf
@@ -19,7 +19,7 @@ user-session=default
# (fails to start session for invalid user)
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/users.conf b/tests/scripts/users.conf
--- a/tests/scripts/users.conf
+++ b/tests/scripts/users.conf
@@ -19,7 +19,7 @@ log-user-changes=true
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-command.conf b/tests/scripts/vnc-command.conf
--- a/tests/scripts/vnc-command.conf
+++ b/tests/scripts/vnc-command.conf
@@ -32,7 +32,7 @@ command=Xvnc -option
#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
# Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-dimensions.conf b/tests/scripts/vnc-dimensions.conf
--- a/tests/scripts/vnc-dimensions.conf
+++ b/tests/scripts/vnc-dimensions.conf
@@ -34,7 +34,7 @@ depth=16
#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
# Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -36,7 +36,7 @@ user-session=default
#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
# Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf
--- a/tests/scripts/vnc-open-file-descriptors.conf
+++ b/tests/scripts/vnc-open-file-descriptors.conf
@@ -35,7 +35,7 @@ user-session=default
#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
# Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/xdmcp-server-login.conf b/tests/scripts/xdmcp-server-login.conf
--- a/tests/scripts/xdmcp-server-login.conf
+++ b/tests/scripts/xdmcp-server-login.conf
@@ -33,7 +33,7 @@ user-session=default
#?XSERVER-98 ACCEPT-CONNECT
# Greeter starts and connects to remote X server
-#?GREETER-X-127.0.0.1:98 START
+#?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter
#?XSERVER-98 ACCEPT-CONNECT
#?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
#?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
diff --git a/tests/scripts/xdmcp-server-open-file-descriptors.conf b/tests/scripts/xdmcp-server-open-file-descriptors.conf
--- a/tests/scripts/xdmcp-server-open-file-descriptors.conf
+++ b/tests/scripts/xdmcp-server-open-file-descriptors.conf
@@ -33,7 +33,7 @@ user-session=default
#?XSERVER-98 ACCEPT-CONNECT
# Greeter starts and connects to remote X server
-#?GREETER-X-127.0.0.1:98 START
+#?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter
#?XSERVER-98 ACCEPT-CONNECT
#?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
#?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
diff --git a/tests/scripts/xserver-no-share.conf b/tests/scripts/xserver-no-share.conf
--- a/tests/scripts/xserver-no-share.conf
+++ b/tests/scripts/xserver-no-share.conf
@@ -17,7 +17,7 @@ xserver-share=false
#?XSERVER-0 ACCEPT-CONNECT
# Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
#?XSERVER-0 ACCEPT-CONNECT
#?GREETER-X-0 CONNECT-XSERVER
#?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -299,7 +299,7 @@ user_removed_cb (LightDMUserList *user_l
int
main (int argc, char **argv)
{
- gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *mir_socket, *mir_vt, *mir_id;
+ gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *xdg_session_class, *mir_socket, *mir_vt, *mir_id;
GString *status_text;
#if !defined(GLIB_VERSION_2_36)
@@ -310,6 +310,7 @@ main (int argc, char **argv)
xdg_seat = getenv ("XDG_SEAT");
xdg_vtnr = getenv ("XDG_VTNR");
xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
+ xdg_session_class = getenv ("XDG_SESSION_CLASS");
mir_socket = getenv ("MIR_SOCKET");
mir_vt = getenv ("MIR_SERVER_VT");
mir_id = getenv ("MIR_ID");
@@ -342,6 +343,8 @@ main (int argc, char **argv)
g_string_append_printf (status_text, " XDG_VTNR=%s", xdg_vtnr);
if (xdg_session_cookie)
g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie);
+ if (xdg_session_class)
+ g_string_append_printf (status_text, " XDG_SESSION_CLASS=%s", xdg_session_class);
if (mir_vt > 0)
g_string_append_printf (status_text, " MIR_SERVER_VT=%s", mir_vt);
status_notify (status_text->str);
diff --git a/tests/src/test-python-greeter b/tests/src/test-python-greeter
--- a/tests/src/test-python-greeter
+++ b/tests/src/test-python-greeter
@@ -13,6 +13,7 @@ display = os.getenv ('DISPLAY');
xdg_seat = os.getenv ('XDG_SEAT');
xdg_vtnr = os.getenv ('XDG_VTNR');
xdg_session_cookie = os.getenv ('XDG_SESSION_COOKIE');
+xdg_session_class = os.getenv ('XDG_SESSION_CLASS');
if display is not None:
if display.startswith (':'):
greeter_id = 'GREETER-X-%s' % display[1:]
@@ -196,6 +197,8 @@ if xdg_vtnr is not None:
status_text += ' XDG_VTNR=%s' % xdg_vtnr
if xdg_session_cookie is not None:
status_text += ' XDG_SESSION_COOKIE=%s' % xdg_session_cookie
+if xdg_session_class is not None:
+ status_text += ' XDG_SESSION_CLASS=%s' % xdg_session_class
status_notify (status_text)
config = GLib.KeyFile ()
diff --git a/tests/src/test-qt-greeter.cpp b/tests/src/test-qt-greeter.cpp
--- a/tests/src/test-qt-greeter.cpp
+++ b/tests/src/test-qt-greeter.cpp
@@ -243,7 +243,7 @@ request_cb (const gchar *request)
int
main(int argc, char *argv[])
{
- gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie;
+ gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *xdg_session_class;
GString *status_text;
#if !defined(GLIB_VERSION_2_36)
@@ -254,6 +254,7 @@ main(int argc, char *argv[])
xdg_seat = getenv ("XDG_SEAT");
xdg_vtnr = getenv ("XDG_VTNR");
xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
+ xdg_session_class = getenv ("XDG_SESSION_CLASS");
if (display)
{
if (display[0] == ':')
@@ -279,6 +280,8 @@ main(int argc, char *argv[])
g_string_append_printf (status_text, " XDG_VTNR=%s", xdg_vtnr);
if (xdg_session_cookie)
g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie);
+ if (xdg_session_class)
+ g_string_append_printf (status_text, " XDG_SESSION_CLASS=%s", xdg_session_class);
status_notify (status_text->str);
g_string_free (status_text, TRUE);
diff --git a/tests/src/test-session.c b/tests/src/test-session.c
--- a/tests/src/test-session.c
+++ b/tests/src/test-session.c
@@ -202,7 +202,7 @@ request_cb (const gchar *request)
int
main (int argc, char **argv)
{
- gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_session_cookie, *desktop_session, *mir_socket, *mir_vt, *mir_id;
+ gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_session_cookie, *xdg_session_class, *desktop_session, *mir_socket, *mir_vt, *mir_id;
GString *status_text;
int fd, open_max;
@@ -211,6 +211,7 @@ main (int argc, char **argv)
xdg_vtnr = getenv ("XDG_VTNR");
xdg_current_desktop = getenv ("XDG_CURRENT_DESKTOP");
xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
+ xdg_session_class = getenv ("XDG_SESSION_CLASS");
desktop_session = getenv ("DESKTOP_SESSION");
mir_socket = getenv ("MIR_SOCKET");
mir_vt = getenv ("MIR_SERVER_VT");
@@ -260,6 +261,8 @@ main (int argc, char **argv)
g_string_append_printf (status_text, " XDG_CURRENT_DESKTOP=%s", xdg_current_desktop);
if (xdg_session_cookie)
g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie);
+ if (xdg_session_class)
+ g_string_append_printf (status_text, " XDG_SESSION_CLASS=%s", xdg_session_class);
if (desktop_session)
g_string_append_printf (status_text, " DESKTOP_SESSION=%s", desktop_session);
if (mir_vt > 0)
