diff -Nru lightdm-1.9.12/common/configuration.c lightdm-1.9.13/common/configuration.c --- lightdm-1.9.12/common/configuration.c 2014-03-06 03:35:03.000000000 +0000 +++ lightdm-1.9.13/common/configuration.c 2014-03-18 04:26:15.000000000 +0000 @@ -9,6 +9,8 @@ * license. */ +#include + #include "configuration.h" struct ConfigurationPrivate @@ -70,6 +72,140 @@ return TRUE; } +static gchar * +path_make_absolute (gchar *path) +{ + gchar *cwd, *abs_path; + + if (!path) + return NULL; + + if (g_path_is_absolute (path)) + return path; + + cwd = g_get_current_dir (); + abs_path = g_build_filename (cwd, path, NULL); + g_free (path); + + return abs_path; +} + +static int +compare_strings (gconstpointer a, gconstpointer b) +{ + return strcmp (a, b); +} + +static void +load_config_directory (const gchar *path, GList **messages) +{ + GDir *dir; + GList *files = NULL, *link; + GError *error = NULL; + + /* Find configuration files */ + dir = g_dir_open (path, 0, &error); + if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) + g_printerr ("Failed to open configuration directory %s: %s\n", path, error->message); + g_clear_error (&error); + if (dir) + { + const gchar *name; + while ((name = g_dir_read_name (dir))) + files = g_list_append (files, g_strdup (name)); + g_dir_close (dir); + } + + /* Sort alphabetically and load onto existing configuration */ + files = g_list_sort (files, compare_strings); + for (link = files; link; link = link->next) + { + gchar *filename = link->data; + gchar *conf_path; + + conf_path = g_build_filename (path, filename, NULL); + if (g_str_has_suffix (filename, ".conf")) + { + if (messages) + *messages = g_list_append (*messages, g_strdup_printf ("Loading configuration from %s", conf_path)); + config_load_from_file (config_get_instance (), conf_path, &error); + if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) + g_printerr ("Failed to load configuration from %s: %s\n", filename, error->message); + g_clear_error (&error); + } + else + g_debug ("Ignoring configuration file %s, it does not have .conf suffix", conf_path); + g_free (conf_path); + } + g_list_free_full (files, g_free); +} + +static void +load_config_directories (const gchar * const *dirs, GList **messages) +{ + gint i; + + /* Load in reverse order, because XDG_* fields are preference-ordered and the directories in front should override directories in back. */ + for (i = g_strv_length ((gchar **)dirs) - 1; i >= 0; i--) + { + gchar *full_dir = g_build_filename (dirs[i], "lightdm", "lightdm.conf.d", NULL); + if (messages) + *messages = g_list_append (*messages, g_strdup_printf ("Loading configuration dirs from %s", full_dir)); + load_config_directory (full_dir, messages); + g_free (full_dir); + } +} + +gboolean +config_load_from_standard_locations (Configuration *config, const gchar *config_path, GList **messages) +{ + gchar *config_dir, *config_d_dir = NULL; + gboolean explicit_config = FALSE; + gboolean success = TRUE; + GError *error = NULL; + + load_config_directories (g_get_system_data_dirs (), messages); + load_config_directories (g_get_system_config_dirs (), messages); + + if (config_path) + { + config_dir = g_path_get_basename (config_path); + config_dir = path_make_absolute (config_dir); + explicit_config = TRUE; + } + else + { + config_dir = g_strdup (CONFIG_DIR); + config_d_dir = g_build_filename (config_dir, "lightdm.conf.d", NULL); + config_path = g_build_filename (config_dir, "lightdm.conf", NULL); + } + config_set_string (config, "LightDM", "config-directory", config_dir); + g_free (config_dir); + + if (config_d_dir) + load_config_directory (config_d_dir, messages); + g_free (config_d_dir); + + if (messages) + *messages = g_list_append (*messages, g_strdup_printf ("Loading configuration from %s", config_path)); + if (!config_load_from_file (config, config_path, &error)) + { + gboolean is_empty; + + is_empty = error && g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT); + + if (explicit_config || !is_empty) + { + if (error) + g_printerr ("Failed to load configuration from %s: %s\n", config_path, error->message); + success = FALSE; + } + } + g_clear_error (&error); + + return success; +} + gchar ** config_get_groups (Configuration *config) { diff -Nru lightdm-1.9.12/common/configuration.h lightdm-1.9.13/common/configuration.h --- lightdm-1.9.12/common/configuration.h 2013-11-26 01:19:26.000000000 +0000 +++ lightdm-1.9.13/common/configuration.h 2014-03-18 04:25:24.000000000 +0000 @@ -38,6 +38,8 @@ gboolean config_load_from_file (Configuration *config, const gchar *path, GError **error); +gboolean config_load_from_standard_locations (Configuration *config, const gchar *config_path, GList **messages); + gchar **config_get_groups (Configuration *config); gchar **config_get_keys (Configuration *config, const gchar *group_name); diff -Nru lightdm-1.9.12/common/Makefile.am lightdm-1.9.13/common/Makefile.am --- lightdm-1.9.12/common/Makefile.am 2014-02-20 00:22:51.000000000 +0000 +++ lightdm-1.9.13/common/Makefile.am 2014-03-18 04:25:24.000000000 +0000 @@ -14,7 +14,8 @@ libcommon_la_CFLAGS = \ $(WARN_CFLAGS) \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" libcommon_la_LIBADD = \ $(GLIB_LDFLAGS) diff -Nru lightdm-1.9.12/configure.ac lightdm-1.9.13/configure.ac --- lightdm-1.9.12/configure.ac 2014-03-17 03:49:34.000000000 +0000 +++ lightdm-1.9.13/configure.ac 2014-03-25 01:40:05.000000000 +0000 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.9.12) +AC_INIT(lightdm, 1.9.13) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) diff -Nru lightdm-1.9.12/debian/changelog lightdm-1.9.13/debian/changelog --- lightdm-1.9.12/debian/changelog 2014-03-17 03:52:09.000000000 +0000 +++ lightdm-1.9.13/debian/changelog 2014-03-25 01:46:41.000000000 +0000 @@ -1,3 +1,12 @@ +lightdm (1.9.13-0ubuntu1) trusty; urgency=medium + + * New upstream release: + - Handle not getting an X connection when attempting to get X layouts. + (LP: #1235915) + - Read config data from both XDG_DATA_DIRS and XDG_CONFIG_DIRS. + + -- Robert Ancell Tue, 25 Mar 2014 14:45:54 +1300 + lightdm (1.9.12-0ubuntu1) trusty; urgency=medium [ Robert Ancell ] diff -Nru lightdm-1.9.12/debian/patches/04_language_handling.patch lightdm-1.9.13/debian/patches/04_language_handling.patch --- lightdm-1.9.12/debian/patches/04_language_handling.patch 2014-03-06 03:35:28.000000000 +0000 +++ lightdm-1.9.13/debian/patches/04_language_handling.patch 2014-03-17 21:43:34.000000000 +0000 @@ -4,8 +4,8 @@ Index: trunk/liblightdm-gobject/language.c =================================================================== ---- trunk.orig/liblightdm-gobject/language.c 2014-03-06 16:35:25.899347214 +1300 -+++ trunk/liblightdm-gobject/language.c 2014-03-06 16:35:25.891347214 +1300 +--- trunk.orig/liblightdm-gobject/language.c 2014-03-18 10:43:32.473863308 +1300 ++++ trunk/liblightdm-gobject/language.c 2014-03-18 10:43:32.469863307 +1300 @@ -40,7 +40,7 @@ static void update_languages (void) @@ -58,9 +58,9 @@ Index: trunk/tests/scripts/language-env.conf =================================================================== ---- trunk.orig/tests/scripts/language-env.conf 2014-03-06 16:35:25.899347214 +1300 -+++ trunk/tests/scripts/language-env.conf 2014-03-06 16:35:25.895347214 +1300 -@@ -23,8 +23,8 @@ +--- trunk.orig/tests/scripts/language-env.conf 2014-03-18 10:43:32.473863308 +1300 ++++ trunk/tests/scripts/language-env.conf 2014-03-18 10:43:32.469863307 +1300 +@@ -24,8 +24,8 @@ #?SESSION-X-0 CONNECT-XSERVER # Check environment variables @@ -73,9 +73,9 @@ Index: trunk/src/seat.c =================================================================== ---- trunk.orig/src/seat.c 2014-03-06 16:35:25.899347214 +1300 -+++ trunk/src/seat.c 2014-03-06 16:35:25.895347214 +1300 -@@ -854,7 +854,7 @@ +--- trunk.orig/src/seat.c 2014-03-18 10:43:32.473863308 +1300 ++++ trunk/src/seat.c 2014-03-18 10:43:32.469863307 +1300 +@@ -867,7 +867,7 @@ session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name); if (language && language[0] != '\0') { diff -Nru lightdm-1.9.12/debian/po/fi.po lightdm-1.9.13/debian/po/fi.po --- lightdm-1.9.12/debian/po/fi.po 2014-03-11 20:16:56.000000000 +0000 +++ lightdm-1.9.13/debian/po/fi.po 2014-03-25 01:27:12.000000000 +0000 @@ -8,20 +8,20 @@ "Project-Id-Version: lightdm\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2007-05-31 08:04+0200\n" -"PO-Revision-Date: 2011-05-13 17:21+0000\n" -"Last-Translator: Jiri Grönroos \n" +"PO-Revision-Date: 2014-03-20 01:40+0000\n" +"Last-Translator: Pasi Lallinaho \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-11 05:53+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-21 06:34+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. Type: select #. Description #: ../lightdm.templates:2001 msgid "Default display manager:" -msgstr "" +msgstr "Oletusnäytönhallintasovellus:" #. Type: select #. Description @@ -30,6 +30,8 @@ "A display manager is a program that provides graphical login capabilities " "for the X Window System." msgstr "" +"Näytönhallintasovellus tarjoaa graafisen kirjautumismahdollisuuden X-" +"ikkunointijärjestelmälle." #. Type: select #. Description @@ -39,6 +41,9 @@ "manager packages are installed. Please select which display manager should " "run by default." msgstr "" +"Vain yksi näytönhallintasovellus voi olla käynnissä X-palvelinta kohden, " +"mutta useampia näytönhallintasovelluksia voi olla asennettuna. Valitse mikä " +"näytönhallintasovellus tulisi käynnistää oletuksena." #. Type: select #. Description @@ -49,6 +54,10 @@ "accordingly, edit each of their init scripts in /etc/init.d, and disable the " "check for a default display manager." msgstr "" +"Useammat näytönhallintasovellukset voivat olla käynnistä samaan aikaan " +"mikäli ne ovat asetettu hallitsemaan eri palvelimia; saavuttaaksesi tämän, " +"muokkaa näytönhallintasovellusten käynnistysasetuksia hakemistossa " +"/etc/init.d sekä poista valinta oletusnäytönhallintasovelluksen kohdalta." #~ msgid "Shutdown" #~ msgstr "Sammuta" diff -Nru lightdm-1.9.12/debian/po/zh_TW.po lightdm-1.9.13/debian/po/zh_TW.po --- lightdm-1.9.12/debian/po/zh_TW.po 2014-03-17 03:16:27.000000000 +0000 +++ lightdm-1.9.13/debian/po/zh_TW.po 2014-03-17 19:59:07.000000000 +0000 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-16 05:50+0000\n" +"X-Launchpad-Export-Date: 2014-03-17 04:56+0000\n" "X-Generator: Launchpad (build 16963)\n" #. Type: select diff -Nru lightdm-1.9.12/liblightdm-gobject/layout.c lightdm-1.9.13/liblightdm-gobject/layout.c --- lightdm-1.9.12/liblightdm-gobject/layout.c 2013-07-30 14:09:28.000000000 +0000 +++ lightdm-1.9.13/liblightdm-gobject/layout.c 2014-03-17 19:59:50.000000000 +0000 @@ -115,6 +115,9 @@ return layouts; display = XOpenDisplay (NULL); + if (display == NULL) + return NULL; + xkl_engine = xkl_engine_get_instance (display); xkl_config = xkl_config_rec_new (); if (!xkl_config_rec_get_from_server (xkl_config, xkl_engine)) diff -Nru lightdm-1.9.12/liblightdm-gobject/session.c lightdm-1.9.13/liblightdm-gobject/session.c --- lightdm-1.9.12/liblightdm-gobject/session.c 2014-02-20 00:22:51.000000000 +0000 +++ lightdm-1.9.13/liblightdm-gobject/session.c 2014-03-18 04:27:01.000000000 +0000 @@ -192,11 +192,9 @@ static void update_sessions (void) { - gchar *config_path = NULL; gchar *sessions_dir; gchar *remote_sessions_dir; - gboolean result; - GError *error = NULL; + gchar *value; if (have_sessions) return; @@ -205,32 +203,21 @@ remote_sessions_dir = g_strdup (REMOTE_SESSIONS_DIR); /* Use session directory from configuration */ - /* FIXME: This should be sent in the greeter connection */ - config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL); - /* FIXME: This should load from lightdm.conf.d as well */ - result = config_load_from_file (config_get_instance (), config_path, &error); - if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) - g_warning ("Failed to open configuration file: %s", error->message); - g_clear_error (&error); - if (result) - { - gchar *value; + config_load_from_standard_locations (config_get_instance (), NULL, NULL); - value = config_get_string (config_get_instance (), "LightDM", "sessions-directory"); - if (value) - { - g_free (sessions_dir); - sessions_dir = value; - } + value = config_get_string (config_get_instance (), "LightDM", "sessions-directory"); + if (value) + { + g_free (sessions_dir); + sessions_dir = value; + } - value = config_get_string (config_get_instance (), "LightDM", "remote-sessions-directory"); - if (value) - { - g_free (remote_sessions_dir); - remote_sessions_dir = value; - } + value = config_get_string (config_get_instance (), "LightDM", "remote-sessions-directory"); + if (value) + { + g_free (remote_sessions_dir); + remote_sessions_dir = value; } - g_free (config_path); local_sessions = load_sessions (sessions_dir); remote_sessions = load_sessions (remote_sessions_dir); diff -Nru lightdm-1.9.12/NEWS lightdm-1.9.13/NEWS --- lightdm-1.9.12/NEWS 2014-03-17 03:49:52.000000000 +0000 +++ lightdm-1.9.13/NEWS 2014-03-25 01:46:07.000000000 +0000 @@ -1,3 +1,8 @@ +Overview of changes in lightdm 1.9.13 + + * Handle not getting an X connection when attempting to get X layouts. + * Read config data from both XDG_DATA_DIRS and XDG_CONFIG_DIRS. + Overview of changes in lightdm 1.9.12 * Ensure X authority is written before X server is started diff -Nru lightdm-1.9.12/src/console-kit.c lightdm-1.9.13/src/console-kit.c --- lightdm-1.9.12/src/console-kit.c 2013-07-30 14:09:28.000000000 +0000 +++ lightdm-1.9.13/src/console-kit.c 2014-03-17 20:08:24.000000000 +0000 @@ -175,6 +175,49 @@ } void +ck_activate_session (const gchar *cookie) +{ + GDBusConnection *bus; + gchar *session_path; + GError *error = NULL; + + g_return_if_fail (cookie != NULL); + + g_debug ("Activating ConsoleKit session %s", cookie); + + bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); + if (error) + g_warning ("Failed to get system bus: %s", error->message); + g_clear_error (&error); + if (!bus) + return; + + session_path = get_ck_session (bus, cookie); + if (session_path) + { + GVariant *result; + + result = g_dbus_connection_call_sync (bus, + "org.freedesktop.ConsoleKit", + session_path, + "org.freedesktop.ConsoleKit.Session", + "Activate", + g_variant_new ("()"), + G_VARIANT_TYPE ("()"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + if (error) + g_warning ("Error activating ConsoleKit session: %s", error->message); + g_clear_error (&error); + if (result) + g_variant_unref (result); + } + g_object_unref (bus); +} + +void ck_close_session (const gchar *cookie) { GDBusConnection *bus; diff -Nru lightdm-1.9.12/src/console-kit.h lightdm-1.9.13/src/console-kit.h --- lightdm-1.9.12/src/console-kit.h 2013-07-30 14:09:28.000000000 +0000 +++ lightdm-1.9.13/src/console-kit.h 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,8 @@ void ck_unlock_session (const gchar *cookie); +void ck_activate_session (const gchar *cookie); + void ck_close_session (const gchar *cookie); G_END_DECLS diff -Nru lightdm-1.9.12/src/lightdm.c lightdm-1.9.13/src/lightdm.c --- lightdm-1.9.12/src/lightdm.c 2014-02-20 00:22:51.000000000 +0000 +++ lightdm-1.9.13/src/lightdm.c 2014-03-18 04:25:24.000000000 +0000 @@ -903,73 +903,6 @@ exit (EXIT_FAILURE); } -static gchar * -path_make_absolute (gchar *path) -{ - gchar *cwd, *abs_path; - - if (!path) - return NULL; - - if (g_path_is_absolute (path)) - return path; - - cwd = g_get_current_dir (); - abs_path = g_build_filename (cwd, path, NULL); - g_free (path); - - return abs_path; -} - -static int -compare_strings (gconstpointer a, gconstpointer b) -{ - return strcmp (a, b); -} - -static void -load_config_directory (const gchar *path, GList **messages) -{ - GDir *dir; - GList *files = NULL, *link; - GError *error = NULL; - - /* Find configuration files */ - dir = g_dir_open (path, 0, &error); - if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) - g_printerr ("Failed to open configuration directory %s: %s\n", path, error->message); - g_clear_error (&error); - if (dir) - { - const gchar *name; - while ((name = g_dir_read_name (dir))) - files = g_list_append (files, g_strdup (name)); - g_dir_close (dir); - } - - /* Sort alphabetically and load onto existing configuration */ - files = g_list_sort (files, compare_strings); - for (link = files; link; link = link->next) - { - gchar *filename = link->data; - gchar *conf_path; - - conf_path = g_build_filename (path, filename, NULL); - if (g_str_has_suffix (filename, ".conf")) - { - *messages = g_list_append (*messages, g_strdup_printf ("Loading configuration from %s", conf_path)); - config_load_from_file (config_get_instance (), conf_path, &error); - if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) - g_printerr ("Failed to load configuration from %s: %s\n", filename, error->message); - g_clear_error (&error); - } - else - g_debug ("Ignoring configuration file %s, it does not have .conf suffix", conf_path); - g_free (conf_path); - } - g_list_free_full (files, g_free); -} - int main (int argc, char **argv) { @@ -978,10 +911,8 @@ gboolean result; gchar **groups, **i, *dir; gint n_seats = 0; - gboolean explicit_config = FALSE; gboolean test_mode = FALSE; gchar *pid_path = "/var/run/lightdm.pid"; - gchar *config_dir, *config_d_dir = NULL; gchar *log_dir = NULL; gchar *run_dir = NULL; gchar *cache_dir = NULL; @@ -1056,21 +987,6 @@ return EXIT_SUCCESS; } - if (config_path) - { - config_dir = g_path_get_basename (config_path); - config_dir = path_make_absolute (config_dir); - explicit_config = TRUE; - } - else - { - config_dir = g_strdup (CONFIG_DIR); - config_d_dir = g_build_filename (config_dir, "lightdm.conf.d", NULL); - config_path = g_build_filename (config_dir, "lightdm.conf", NULL); - } - config_set_string (config_get_instance (), "LightDM", "config-directory", config_dir); - g_free (config_dir); - if (!test_mode && getuid () != 0) { g_printerr ("Only root can run Light Display Manager. To run as a regular user for testing run with the --test-mode flag.\n"); @@ -1125,25 +1041,8 @@ } /* Load config file(s) */ - load_config_directory (SYSTEM_CONFIG_DIR, &messages); - if (config_d_dir) - load_config_directory (config_d_dir, &messages); - g_free (config_d_dir); - messages = g_list_append (messages, g_strdup_printf ("Loading configuration from %s", config_path)); - if (!config_load_from_file (config_get_instance (), config_path, &error)) - { - gboolean is_empty; - - is_empty = error && g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT); - - if (explicit_config || !is_empty) - { - if (error) - g_printerr ("Failed to load configuration from %s: %s\n", config_path, error->message); - exit (EXIT_FAILURE); - } - } - g_clear_error (&error); + if (!config_load_from_standard_locations (config_get_instance (), config_path, &messages)) + exit (EXIT_FAILURE); g_free (config_path); /* Set default values */ diff -Nru lightdm-1.9.12/src/login1.c lightdm-1.9.13/src/login1.c --- lightdm-1.9.12/src/login1.c 2014-03-17 03:17:08.000000000 +0000 +++ lightdm-1.9.13/src/login1.c 2014-03-17 20:08:24.000000000 +0000 @@ -136,28 +136,49 @@ if (error) g_warning ("Error unlocking login1 session: %s", error->message); g_clear_error (&error); - if (result) - { g_variant_unref (result); + } + g_object_unref (bus); +} + +void +login1_activate_session (const gchar *session_path) +{ + GDBusConnection *bus; + GError *error = NULL; + + g_return_if_fail (session_path != NULL); + + g_debug ("Activating login1 session %s", session_path); - result = g_dbus_connection_call_sync (bus, - "org.freedesktop.login1", - session_path, - "org.freedesktop.login1.Session", - "Activate", - g_variant_new ("()"), - G_VARIANT_TYPE ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - NULL, - &error); - if (error) - g_warning ("Error activating login1 session: %s", error->message); - g_clear_error (&error); - if (result) - g_variant_unref (result); - } + bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); + if (error) + g_warning ("Failed to get system bus: %s", error->message); + g_clear_error (&error); + if (!bus) + return; + + if (session_path) + { + GVariant *result; + + result = g_dbus_connection_call_sync (bus, + "org.freedesktop.login1", + session_path, + "org.freedesktop.login1.Session", + "Activate", + g_variant_new ("()"), + G_VARIANT_TYPE ("()"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + if (error) + g_warning ("Error activating login1 session: %s", error->message); + g_clear_error (&error); + if (result) + g_variant_unref (result); } g_object_unref (bus); } diff -Nru lightdm-1.9.12/src/login1.h lightdm-1.9.13/src/login1.h --- lightdm-1.9.12/src/login1.h 2013-07-30 14:09:28.000000000 +0000 +++ lightdm-1.9.13/src/login1.h 2014-03-17 20:08:24.000000000 +0000 @@ -24,6 +24,8 @@ void login1_unlock_session (const gchar *session_path); +void login1_activate_session (const gchar *session_path); + G_END_DECLS #endif /* _LOGIN1_H_ */ diff -Nru lightdm-1.9.12/src/Makefile.am lightdm-1.9.13/src/Makefile.am --- lightdm-1.9.12/src/Makefile.am 2014-02-20 00:22:51.000000000 +0000 +++ lightdm-1.9.13/src/Makefile.am 2014-03-18 04:25:24.000000000 +0000 @@ -78,12 +78,10 @@ $(LIGHTDM_CFLAGS) \ -I"$(top_srcdir)/common" \ -DSBIN_DIR=\"$(sbindir)\" \ - -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \ -DUSERS_DIR=\"$(localstatedir)/lib/lightdm-data\" \ -DLOG_DIR=\"$(localstatedir)/log/lightdm\" \ -DRUN_DIR=\"$(localstatedir)/run/lightdm\" \ -DCACHE_DIR=\"$(localstatedir)/cache/lightdm\" \ - -DSYSTEM_CONFIG_DIR=\"$(pkgdatadir)/lightdm.conf.d\" \ -DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions\" \ -DREMOTE_SESSIONS_DIR=\"$(pkgdatadir)/remote-sessions\" \ -DGREETERS_DIR=\"$(pkgdatadir)/greeters:$(datadir)/xgreeters\" @@ -100,7 +98,6 @@ dm_tool_CFLAGS = \ $(WARN_CFLAGS) \ $(LIGHTDM_CFLAGS) \ - -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \ -DLOCALE_DIR=\"$(datadir)/locale\" dm_tool_LDADD = \ diff -Nru lightdm-1.9.12/src/seat.c lightdm-1.9.13/src/seat.c --- lightdm-1.9.12/src/seat.c 2014-03-12 19:56:34.000000000 +0000 +++ lightdm-1.9.13/src/seat.c 2014-03-17 21:43:38.000000000 +0000 @@ -232,6 +232,8 @@ session_lock (seat->priv->active_session); g_object_unref (seat->priv->active_session); } + + session_activate (session); seat->priv->active_session = g_object_ref (session); } @@ -526,6 +528,17 @@ g_object_unref (seat->priv->session_to_activate); seat->priv->session_to_activate = NULL; } + else if (seat->priv->active_session) + { + /* Multiple sessions can theoretically be on the same VT (especially + if using Mir). If a new session appears on an existing active VT, + logind will mark it as active, while ConsoleKit will re-mark the + oldest session as active. In either case, that may not be the + session that we want to be active. So let's be explicit and + re-activate the correct session whenever a new session starts. + There's no harm to do this in seats that enforce separate VTs. */ + session_activate (seat->priv->active_session); + } } static Session * diff -Nru lightdm-1.9.12/src/session.c lightdm-1.9.13/src/session.c --- lightdm-1.9.12/src/session.c 2014-03-06 03:35:03.000000000 +0000 +++ lightdm-1.9.13/src/session.c 2014-03-17 20:08:24.000000000 +0000 @@ -829,6 +829,19 @@ } void +session_activate (Session *session) +{ + g_return_if_fail (session != NULL); + if (getuid () == 0) + { + if (session->priv->login1_session) + login1_activate_session (session->priv->login1_session); + else if (session->priv->console_kit_cookie) + ck_activate_session (session->priv->console_kit_cookie); + } +} + +void session_stop (Session *session) { g_return_if_fail (session != NULL); diff -Nru lightdm-1.9.12/src/session.h lightdm-1.9.13/src/session.h --- lightdm-1.9.12/src/session.h 2013-10-29 16:18:32.000000000 +0000 +++ lightdm-1.9.13/src/session.h 2014-03-17 20:08:24.000000000 +0000 @@ -130,6 +130,8 @@ void session_unlock (Session *session); +void session_activate (Session *session); + void session_stop (Session *session); gboolean session_get_is_stopping (Session *session); diff -Nru lightdm-1.9.12/tests/scripts/additional-config.conf lightdm-1.9.13/tests/scripts/additional-config.conf --- lightdm-1.9.12/tests/scripts/additional-config.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/additional-config.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/additional-config-priority.conf lightdm-1.9.13/tests/scripts/additional-config-priority.conf --- lightdm-1.9.12/tests/scripts/additional-config-priority.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/additional-config-priority.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/additional-system-config.conf lightdm-1.9.13/tests/scripts/additional-system-config.conf --- lightdm-1.9.12/tests/scripts/additional-system-config.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/additional-system-config.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/additional-system-config-priority.conf lightdm-1.9.13/tests/scripts/additional-system-config-priority.conf --- lightdm-1.9.12/tests/scripts/additional-system-config-priority.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/additional-system-config-priority.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/autologin.conf lightdm-1.9.13/tests/scripts/autologin.conf --- lightdm-1.9.12/tests/scripts/autologin.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/autologin-guest.conf lightdm-1.9.13/tests/scripts/autologin-guest.conf --- lightdm-1.9.12/tests/scripts/autologin-guest.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-guest.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Guest session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/autologin-guest-fail-setup-script.conf lightdm-1.9.13/tests/scripts/autologin-guest-fail-setup-script.conf --- lightdm-1.9.12/tests/scripts/autologin-guest-fail-setup-script.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-guest-fail-setup-script.conf 2014-03-17 20:08:24.000000000 +0000 @@ -24,6 +24,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/autologin-guest-in-background.conf lightdm-1.9.13/tests/scripts/autologin-guest-in-background.conf --- lightdm-1.9.12/tests/scripts/autologin-guest-in-background.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-guest-in-background.conf 2014-03-17 20:08:24.000000000 +0000 @@ -16,6 +16,7 @@ #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -28,6 +29,7 @@ #?XSERVER-1 ACCEPT-CONNECT #?GUEST-ACCOUNT ADD USERNAME=guest-.* #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/autologin-guest-logout.conf lightdm-1.9.13/tests/scripts/autologin-guest-logout.conf --- lightdm-1.9.12/tests/scripts/autologin-guest-logout.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-guest-logout.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Guest session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -44,6 +45,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/autologin-guest-session-config.conf lightdm-1.9.13/tests/scripts/autologin-guest-session-config.conf --- lightdm-1.9.12/tests/scripts/autologin-guest-session-config.conf 2014-03-12 19:56:34.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-guest-session-config.conf 2014-03-17 20:08:24.000000000 +0000 @@ -23,6 +23,7 @@ # Guest session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/autologin-guest-timeout.conf lightdm-1.9.13/tests/scripts/autologin-guest-timeout.conf --- lightdm-1.9.12/tests/scripts/autologin-guest-timeout.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-guest-timeout.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -39,6 +40,7 @@ # Guest session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/autologin-in-background.conf lightdm-1.9.13/tests/scripts/autologin-in-background.conf --- lightdm-1.9.12/tests/scripts/autologin-in-background.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-in-background.conf 2014-03-17 20:08:24.000000000 +0000 @@ -16,6 +16,7 @@ #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -27,6 +28,7 @@ #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/autologin-invalid-greeter.conf lightdm-1.9.13/tests/scripts/autologin-invalid-greeter.conf --- lightdm-1.9.12/tests/scripts/autologin-invalid-greeter.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-invalid-greeter.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/autologin-invalid-session.conf lightdm-1.9.13/tests/scripts/autologin-invalid-session.conf --- lightdm-1.9.12/tests/scripts/autologin-invalid-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-invalid-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/autologin-invalid-user.conf lightdm-1.9.13/tests/scripts/autologin-invalid-user.conf --- lightdm-1.9.12/tests/scripts/autologin-invalid-user.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-invalid-user.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/autologin-logout.conf lightdm-1.9.13/tests/scripts/autologin-logout.conf --- lightdm-1.9.12/tests/scripts/autologin-logout.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-logout.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Autologin session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -38,6 +39,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/autologin-new-authtok.conf lightdm-1.9.13/tests/scripts/autologin-new-authtok.conf --- lightdm-1.9.12/tests/scripts/autologin-new-authtok.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-new-authtok.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/autologin-password.conf lightdm-1.9.13/tests/scripts/autologin-password.conf --- lightdm-1.9.12/tests/scripts/autologin-password.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-password.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/autologin-previous-session.conf lightdm-1.9.13/tests/scripts/autologin-previous-session.conf --- lightdm-1.9.12/tests/scripts/autologin-previous-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-previous-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/autologin-session-crash.conf lightdm-1.9.13/tests/scripts/autologin-session-crash.conf --- lightdm-1.9.12/tests/scripts/autologin-session-crash.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-session-crash.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -38,6 +39,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/autologin-session-error.conf lightdm-1.9.13/tests/scripts/autologin-session-error.conf --- lightdm-1.9.12/tests/scripts/autologin-session-error.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-session-error.conf 2014-03-17 20:08:24.000000000 +0000 @@ -32,6 +32,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/autologin-timeout.conf lightdm-1.9.13/tests/scripts/autologin-timeout.conf --- lightdm-1.9.12/tests/scripts/autologin-timeout.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-timeout.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -36,6 +37,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/autologin-timeout-in-background.conf lightdm-1.9.13/tests/scripts/autologin-timeout-in-background.conf --- lightdm-1.9.12/tests/scripts/autologin-timeout-in-background.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-timeout-in-background.conf 2014-03-17 20:08:24.000000000 +0000 @@ -17,6 +17,7 @@ #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -28,6 +29,7 @@ #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER @@ -40,6 +42,7 @@ #?*GREETER-X-0 START-SESSION # Switch to existing session +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Quit greeter diff -Nru lightdm-1.9.12/tests/scripts/autologin-xserver-crash.conf lightdm-1.9.13/tests/scripts/autologin-xserver-crash.conf --- lightdm-1.9.12/tests/scripts/autologin-xserver-crash.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/autologin-xserver-crash.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -36,6 +37,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/cancel-authentication.conf lightdm-1.9.13/tests/scripts/cancel-authentication.conf --- lightdm-1.9.12/tests/scripts/cancel-authentication.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/cancel-authentication.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/change-authentication.conf lightdm-1.9.13/tests/scripts/change-authentication.conf --- lightdm-1.9.12/tests/scripts/change-authentication.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/change-authentication.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/console-kit.conf lightdm-1.9.13/tests/scripts/console-kit.conf --- lightdm-1.9.12/tests/scripts/console-kit.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/console-kit.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1 +#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/corrupt-xauthority.conf lightdm-1.9.13/tests/scripts/corrupt-xauthority.conf --- lightdm-1.9.12/tests/scripts/corrupt-xauthority.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/corrupt-xauthority.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/corrupt-xauth DESKTOP_SESSION=default USER=corrupt-xauth +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/crash-authenticate.conf lightdm-1.9.13/tests/scripts/crash-authenticate.conf --- lightdm-1.9.12/tests/scripts/crash-authenticate.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/crash-authenticate.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/cred-error.conf lightdm-1.9.13/tests/scripts/cred-error.conf --- lightdm-1.9.12/tests/scripts/cred-error.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/cred-error.conf 2014-03-17 20:08:24.000000000 +0000 @@ -32,6 +32,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/cred-expired.conf lightdm-1.9.13/tests/scripts/cred-expired.conf --- lightdm-1.9.12/tests/scripts/cred-expired.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/cred-expired.conf 2014-03-17 20:08:24.000000000 +0000 @@ -32,6 +32,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/cred-unavail.conf lightdm-1.9.13/tests/scripts/cred-unavail.conf --- lightdm-1.9.12/tests/scripts/cred-unavail.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/cred-unavail.conf 2014-03-17 20:08:24.000000000 +0000 @@ -32,6 +32,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/dbus.conf lightdm-1.9.13/tests/scripts/dbus.conf --- lightdm-1.9.12/tests/scripts/dbus.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/dbus.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -38,6 +39,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/denied.conf lightdm-1.9.13/tests/scripts/denied.conf --- lightdm-1.9.12/tests/scripts/denied.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/denied.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/expired.conf lightdm-1.9.13/tests/scripts/expired.conf --- lightdm-1.9.12/tests/scripts/expired.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/expired.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/greeter-allow-guest.conf lightdm-1.9.13/tests/scripts/greeter-allow-guest.conf --- lightdm-1.9.12/tests/scripts/greeter-allow-guest.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/greeter-allow-guest.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/greeter-crash.conf lightdm-1.9.13/tests/scripts/greeter-crash.conf --- lightdm-1.9.12/tests/scripts/greeter-crash.conf 2014-02-27 00:29:27.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/greeter-crash.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/greeter-default-session.conf lightdm-1.9.13/tests/scripts/greeter-default-session.conf --- lightdm-1.9.12/tests/scripts/greeter-default-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/greeter-default-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/greeter-fail-start.conf lightdm-1.9.13/tests/scripts/greeter-fail-start.conf --- lightdm-1.9.12/tests/scripts/greeter-fail-start.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/greeter-fail-start.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter fails to start #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?GREETER-X-0 EXIT CODE=1 # X server stopped diff -Nru lightdm-1.9.12/tests/scripts/greeter-hide-users.conf lightdm-1.9.13/tests/scripts/greeter-hide-users.conf --- lightdm-1.9.12/tests/scripts/greeter-hide-users.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/greeter-hide-users.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/greeter-show-manual-login.conf lightdm-1.9.13/tests/scripts/greeter-show-manual-login.conf --- lightdm-1.9.12/tests/scripts/greeter-show-manual-login.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/greeter-show-manual-login.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/greeter-show-remote-login.conf lightdm-1.9.13/tests/scripts/greeter-show-remote-login.conf --- lightdm-1.9.12/tests/scripts/greeter-show-remote-login.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/greeter-show-remote-login.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/greeter-wrapper.conf lightdm-1.9.13/tests/scripts/greeter-wrapper.conf --- lightdm-1.9.12/tests/scripts/greeter-wrapper.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/greeter-wrapper.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/greeter-xserver-crash.conf lightdm-1.9.13/tests/scripts/greeter-xserver-crash.conf --- lightdm-1.9.12/tests/scripts/greeter-xserver-crash.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/greeter-xserver-crash.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -36,6 +37,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/group-membership.conf lightdm-1.9.13/tests/scripts/group-membership.conf --- lightdm-1.9.12/tests/scripts/group-membership.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/group-membership.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/group-member DESKTOP_SESSION=default USER=group-member +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/guest-wrapper.conf lightdm-1.9.13/tests/scripts/guest-wrapper.conf --- lightdm-1.9.12/tests/scripts/guest-wrapper.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/guest-wrapper.conf 2014-03-17 20:08:24.000000000 +0000 @@ -26,6 +26,7 @@ # Guest session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/home-dir-on-authenticate.conf lightdm-1.9.13/tests/scripts/home-dir-on-authenticate.conf --- lightdm-1.9.12/tests/scripts/home-dir-on-authenticate.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/home-dir-on-authenticate.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/mount-home-dir DESKTOP_SESSION=default USER=mount-home-dir +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/home-dir-on-session.conf lightdm-1.9.13/tests/scripts/home-dir-on-session.conf --- lightdm-1.9.12/tests/scripts/home-dir-on-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/home-dir-on-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/make-home-dir DESKTOP_SESSION=default USER=make-home-dir +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/language.conf lightdm-1.9.13/tests/scripts/language.conf --- lightdm-1.9.12/tests/scripts/language.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/language.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/language-env.conf lightdm-1.9.13/tests/scripts/language-env.conf --- lightdm-1.9.12/tests/scripts/language-env.conf 2014-03-06 03:35:31.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/language-env.conf 2014-03-17 21:43:38.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-language DESKTOP_SESSION=default USER=have-language +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/language-no-accounts-service.conf lightdm-1.9.13/tests/scripts/language-no-accounts-service.conf --- lightdm-1.9.12/tests/scripts/language-no-accounts-service.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/language-no-accounts-service.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/lock-seat.conf lightdm-1.9.13/tests/scripts/lock-seat.conf --- lightdm-1.9.12/tests/scripts/lock-seat.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/lock-seat.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -46,6 +47,7 @@ #?GREETER-X-1 LOCK-HINT # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Cleanup diff -Nru lightdm-1.9.12/tests/scripts/lock-seat-console-kit.conf lightdm-1.9.13/tests/scripts/lock-seat-console-kit.conf --- lightdm-1.9.12/tests/scripts/lock-seat-console-kit.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/lock-seat-console-kit.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1 +#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -49,6 +50,7 @@ #?GREETER-X-1 LOCK-HINT # Switch to greeter +#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:1 #?VT ACTIVATE VT=8 # Cleanup diff -Nru lightdm-1.9.12/tests/scripts/lock-seat-return-session.conf lightdm-1.9.13/tests/scripts/lock-seat-return-session.conf --- lightdm-1.9.12/tests/scripts/lock-seat-return-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/lock-seat-return-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -46,6 +47,7 @@ #?GREETER-X-1 LOCK-HINT # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Login as existing user @@ -59,6 +61,7 @@ #?LOGIN1 UNLOCK-SESSION # Return to session +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?VT ACTIVATE VT=7 # Greeter and X server stop diff -Nru lightdm-1.9.12/tests/scripts/lock-seat-return-session-console-kit.conf lightdm-1.9.13/tests/scripts/lock-seat-return-session-console-kit.conf --- lightdm-1.9.12/tests/scripts/lock-seat-return-session-console-kit.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/lock-seat-return-session-console-kit.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1 +#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -49,6 +50,7 @@ #?GREETER-X-1 LOCK-HINT # Switch to greeter +#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:1 #?VT ACTIVATE VT=8 # Login as existing user @@ -62,6 +64,7 @@ #?CONSOLE-KIT UNLOCK-SESSION # Return to session +#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0 #?VT ACTIVATE VT=7 # Greeter and X server stop diff -Nru lightdm-1.9.12/tests/scripts/lock-session.conf lightdm-1.9.13/tests/scripts/lock-session.conf --- lightdm-1.9.12/tests/scripts/lock-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/lock-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -47,6 +48,7 @@ #?GREETER-X-1 LOCK-HINT # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Cleanup diff -Nru lightdm-1.9.12/tests/scripts/lock-session-no-password.conf lightdm-1.9.13/tests/scripts/lock-session-no-password.conf --- lightdm-1.9.12/tests/scripts/lock-session-no-password.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/lock-session-no-password.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -47,6 +48,7 @@ #?GREETER-X-1 LOCK-HINT # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Cleanup diff -Nru lightdm-1.9.12/tests/scripts/lock-session-return-session.conf lightdm-1.9.13/tests/scripts/lock-session-return-session.conf --- lightdm-1.9.12/tests/scripts/lock-session-return-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/lock-session-return-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -34,6 +35,9 @@ #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT +# Session is locked +#?LOGIN1 LOCK-SESSION + # Greeter starts with session user selected #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter #?XSERVER-1 ACCEPT-CONNECT @@ -44,11 +48,9 @@ #?GREETER-X-1 LOCK-HINT # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 -# Session is locked -#?LOGIN1 LOCK-SESSION - # Login as existing user #?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1 #?GREETER-X-1 SHOW-PROMPT TEXT="Password:" @@ -60,6 +62,7 @@ #?LOGIN1 UNLOCK-SESSION # Return to session +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?VT ACTIVATE VT=7 # Greeter and X server stop diff -Nru lightdm-1.9.12/tests/scripts/login.conf lightdm-1.9.13/tests/scripts/login.conf --- lightdm-1.9.12/tests/scripts/login.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -33,6 +34,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-crash-authenticate.conf lightdm-1.9.13/tests/scripts/login-crash-authenticate.conf --- lightdm-1.9.12/tests/scripts/login-crash-authenticate.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-crash-authenticate.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-guest.conf lightdm-1.9.13/tests/scripts/login-guest.conf --- lightdm-1.9.12/tests/scripts/login-guest.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-guest.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -34,6 +35,7 @@ # Guest session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-guest-disabled.conf lightdm-1.9.13/tests/scripts/login-guest-disabled.conf --- lightdm-1.9.12/tests/scripts/login-guest-disabled.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-guest-disabled.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-guest-fail-setup-script.conf lightdm-1.9.13/tests/scripts/login-guest-fail-setup-script.conf --- lightdm-1.9.12/tests/scripts/login-guest-fail-setup-script.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-guest-fail-setup-script.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -36,6 +37,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-guest-logout.conf lightdm-1.9.13/tests/scripts/login-guest-logout.conf --- lightdm-1.9.12/tests/scripts/login-guest-logout.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-guest-logout.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -34,6 +35,7 @@ # Guest session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -56,6 +58,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-guest-no-setup-script.conf lightdm-1.9.13/tests/scripts/login-guest-no-setup-script.conf --- lightdm-1.9.12/tests/scripts/login-guest-no-setup-script.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-guest-no-setup-script.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-guest-pick-session.conf lightdm-1.9.13/tests/scripts/login-guest-pick-session.conf --- lightdm-1.9.12/tests/scripts/login-guest-pick-session.conf 2014-03-12 19:56:10.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-guest-pick-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -34,6 +35,7 @@ # Guest session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-guest-session-config.conf lightdm-1.9.13/tests/scripts/login-guest-session-config.conf --- lightdm-1.9.12/tests/scripts/login-guest-session-config.conf 2014-03-12 19:56:34.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-guest-session-config.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -35,6 +36,7 @@ # Guest session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-info-prompt.conf lightdm-1.9.13/tests/scripts/login-info-prompt.conf --- lightdm-1.9.12/tests/scripts/login-info-prompt.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-info-prompt.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-invalid-session.conf lightdm-1.9.13/tests/scripts/login-invalid-session.conf --- lightdm-1.9.12/tests/scripts/login-invalid-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-invalid-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-invalid-user.conf lightdm-1.9.13/tests/scripts/login-invalid-user.conf --- lightdm-1.9.12/tests/scripts/login-invalid-user.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-invalid-user.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-logout.conf lightdm-1.9.13/tests/scripts/login-logout.conf --- lightdm-1.9.12/tests/scripts/login-logout.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-logout.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -33,6 +34,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -52,6 +54,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-long-password.conf lightdm-1.9.13/tests/scripts/login-long-password.conf --- lightdm-1.9.12/tests/scripts/login-long-password.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-long-password.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-long-username.conf lightdm-1.9.13/tests/scripts/login-long-username.conf --- lightdm-1.9.12/tests/scripts/login-long-username.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-long-username.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-manual.conf lightdm-1.9.13/tests/scripts/login-manual.conf --- lightdm-1.9.12/tests/scripts/login-manual.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-manual.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -35,6 +36,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-manual-previous-session.conf lightdm-1.9.13/tests/scripts/login-manual-previous-session.conf --- lightdm-1.9.12/tests/scripts/login-manual-previous-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-manual-previous-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -30,6 +31,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-manual-remember-session.conf lightdm-1.9.13/tests/scripts/login-manual-remember-session.conf --- lightdm-1.9.12/tests/scripts/login-manual-remember-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-manual-remember-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -30,6 +31,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -49,6 +51,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -64,6 +67,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c3 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-multi-info-prompt.conf lightdm-1.9.13/tests/scripts/login-multi-info-prompt.conf --- lightdm-1.9.12/tests/scripts/login-multi-info-prompt.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-multi-info-prompt.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-multi-prompt.conf lightdm-1.9.13/tests/scripts/login-multi-prompt.conf --- lightdm-1.9.12/tests/scripts/login-multi-prompt.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-multi-prompt.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-new-authtok.conf lightdm-1.9.13/tests/scripts/login-new-authtok.conf --- lightdm-1.9.12/tests/scripts/login-new-authtok.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-new-authtok.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -33,6 +34,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/new-authtok DESKTOP_SESSION=default USER=new-authtok +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-no-password.conf lightdm-1.9.13/tests/scripts/login-no-password.conf --- lightdm-1.9.12/tests/scripts/login-no-password.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-no-password.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -31,6 +32,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-pam.conf lightdm-1.9.13/tests/scripts/login-pam.conf --- lightdm-1.9.12/tests/scripts/login-pam.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-pam.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -35,6 +36,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam DESKTOP_SESSION=default USER=log-pam +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-pick-session.conf lightdm-1.9.13/tests/scripts/login-pick-session.conf --- lightdm-1.9.12/tests/scripts/login-pick-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-pick-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -28,6 +29,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-previous-session.conf lightdm-1.9.13/tests/scripts/login-previous-session.conf --- lightdm-1.9.12/tests/scripts/login-previous-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-previous-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -28,6 +29,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-remember-session.conf lightdm-1.9.13/tests/scripts/login-remember-session.conf --- lightdm-1.9.12/tests/scripts/login-remember-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-remember-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -28,6 +29,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -47,6 +49,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -60,6 +63,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c3 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-remote-session.conf lightdm-1.9.13/tests/scripts/login-remote-session.conf --- lightdm-1.9.12/tests/scripts/login-remote-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-remote-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -37,6 +38,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=test-remote USER=guest-.* +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/login-session-crash.conf lightdm-1.9.13/tests/scripts/login-session-crash.conf --- lightdm-1.9.12/tests/scripts/login-session-crash.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-session-crash.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -33,6 +34,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -52,6 +54,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-two-factor.conf lightdm-1.9.13/tests/scripts/login-two-factor.conf --- lightdm-1.9.12/tests/scripts/login-two-factor.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-two-factor.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-wrong-password.conf lightdm-1.9.13/tests/scripts/login-wrong-password.conf --- lightdm-1.9.12/tests/scripts/login-wrong-password.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-wrong-password.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/login-xserver-crash.conf lightdm-1.9.13/tests/scripts/login-xserver-crash.conf --- lightdm-1.9.12/tests/scripts/login-xserver-crash.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/login-xserver-crash.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -33,6 +34,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -50,6 +52,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/mir-autologin.conf lightdm-1.9.13/tests/scripts/mir-autologin.conf --- lightdm-1.9.12/tests/scripts/mir-autologin.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/mir-autologin.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Session starts #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 # Cleanup #?*STOP-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/mir-greeter.conf lightdm-1.9.13/tests/scripts/mir-greeter.conf --- lightdm-1.9.12/tests/scripts/mir-greeter.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/mir-greeter.conf 2014-03-17 20:08:24.000000000 +0000 @@ -11,6 +11,7 @@ # Greeter starts #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/mir-session-compositor-crash.conf lightdm-1.9.13/tests/scripts/mir-session-compositor-crash.conf --- lightdm-1.9.12/tests/scripts/mir-session-compositor-crash.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/mir-session-compositor-crash.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Session starts #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 # Crash system compositor #?*UNITY-SYSTEM-COMPOSITOR CRASH @@ -32,6 +33,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/mir-session.conf lightdm-1.9.13/tests/scripts/mir-session.conf --- lightdm-1.9.12/tests/scripts/mir-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/mir-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -41,6 +42,7 @@ # Session starts #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 # Cleanup #?*STOP-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/mir-session-crash.conf lightdm-1.9.13/tests/scripts/mir-session-crash.conf --- lightdm-1.9.12/tests/scripts/mir-session-crash.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/mir-session-crash.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Session starts #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 # Crash session #?*SESSION-MIR-session-0 CRASH @@ -32,6 +33,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/multi-seat.conf lightdm-1.9.13/tests/scripts/multi-seat.conf --- lightdm-1.9.12/tests/scripts/multi-seat.conf 2014-03-17 03:42:26.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/multi-seat.conf 2014-03-17 20:08:24.000000000 +0000 @@ -17,6 +17,7 @@ #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -28,6 +29,7 @@ #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT #?GREETER-X-1 START XDG_SEAT=seat1 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-1 ACCEPT-CONNECT #?GREETER-X-1 CONNECT-XSERVER #?GREETER-X-1 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/no-accounts-service.conf lightdm-1.9.13/tests/scripts/no-accounts-service.conf --- lightdm-1.9.12/tests/scripts/no-accounts-service.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/no-accounts-service.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/no-config.conf lightdm-1.9.13/tests/scripts/no-config.conf --- lightdm-1.9.12/tests/scripts/no-config.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/no-config.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/no-console-kit.conf lightdm-1.9.13/tests/scripts/no-console-kit.conf --- lightdm-1.9.12/tests/scripts/no-console-kit.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/no-console-kit.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/no-login1.conf lightdm-1.9.13/tests/scripts/no-login1.conf --- lightdm-1.9.12/tests/scripts/no-login1.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/no-login1.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1 +#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/open-file-descriptors.conf lightdm-1.9.13/tests/scripts/open-file-descriptors.conf --- lightdm-1.9.12/tests/scripts/open-file-descriptors.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/open-file-descriptors.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -34,6 +35,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/pam.conf lightdm-1.9.13/tests/scripts/pam.conf --- lightdm-1.9.12/tests/scripts/pam.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/pam.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam DESKTOP_SESSION=default USER=log-pam +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/plymouth-active-vt.conf lightdm-1.9.13/tests/scripts/plymouth-active-vt.conf --- lightdm-1.9.12/tests/scripts/plymouth-active-vt.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/plymouth-active-vt.conf 2014-03-17 20:08:24.000000000 +0000 @@ -28,6 +28,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/plymouth-inactive-vt.conf lightdm-1.9.13/tests/scripts/plymouth-inactive-vt.conf --- lightdm-1.9.12/tests/scripts/plymouth-inactive-vt.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/plymouth-inactive-vt.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/power.conf lightdm-1.9.13/tests/scripts/power.conf --- lightdm-1.9.12/tests/scripts/power.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/power.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/power-no-console-kit.conf lightdm-1.9.13/tests/scripts/power-no-console-kit.conf --- lightdm-1.9.12/tests/scripts/power-no-console-kit.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/power-no-console-kit.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/power-no-login1.conf lightdm-1.9.13/tests/scripts/power-no-login1.conf --- lightdm-1.9.12/tests/scripts/power-no-login1.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/power-no-login1.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_CLASS=greeter +#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/restart-authentication.conf lightdm-1.9.13/tests/scripts/restart-authentication.conf --- lightdm-1.9.12/tests/scripts/restart-authentication.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/restart-authentication.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/script-hooks.conf lightdm-1.9.13/tests/scripts/script-hooks.conf --- lightdm-1.9.12/tests/scripts/script-hooks.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/script-hooks.conf 2014-03-17 20:08:24.000000000 +0000 @@ -28,6 +28,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -57,6 +58,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/script-hook-session-setup-fail.conf lightdm-1.9.13/tests/scripts/script-hook-session-setup-fail.conf --- lightdm-1.9.12/tests/scripts/script-hook-session-setup-fail.conf 2014-03-14 02:47:27.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/script-hook-session-setup-fail.conf 2014-03-17 20:08:24.000000000 +0000 @@ -23,6 +23,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/script-hook-session-setup-missing.conf lightdm-1.9.13/tests/scripts/script-hook-session-setup-missing.conf --- lightdm-1.9.12/tests/scripts/script-hook-session-setup-missing.conf 2014-03-14 02:47:27.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/script-hook-session-setup-missing.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/session-stderr-backup.conf lightdm-1.9.13/tests/scripts/session-stderr-backup.conf --- lightdm-1.9.12/tests/scripts/session-stderr-backup.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/session-stderr-backup.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -35,6 +36,7 @@ #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -44,6 +46,7 @@ #?*GREETER-X-0 START-SESSION #?GREETER-X-0 TERMINATE SIGNAL=15 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -64,6 +67,7 @@ #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c3 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -73,6 +77,7 @@ #?*GREETER-X-0 START-SESSION #?GREETER-X-0 TERMINATE SIGNAL=15 #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c4 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/session-stderr.conf lightdm-1.9.13/tests/scripts/session-stderr.conf --- lightdm-1.9.12/tests/scripts/session-stderr.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/session-stderr.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/session-stderr-multi-write.conf lightdm-1.9.13/tests/scripts/session-stderr-multi-write.conf --- lightdm-1.9.12/tests/scripts/session-stderr-multi-write.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/session-stderr-multi-write.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/session-stdout.conf lightdm-1.9.13/tests/scripts/session-stdout.conf --- lightdm-1.9.12/tests/scripts/session-stdout.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/session-stdout.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/shared-data-greeter-to-session.conf lightdm-1.9.13/tests/scripts/shared-data-greeter-to-session.conf --- lightdm-1.9.12/tests/scripts/shared-data-greeter-to-session.conf 2014-03-04 02:37:38.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/shared-data-greeter-to-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -35,6 +36,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/shared-data-invalid-user.conf lightdm-1.9.13/tests/scripts/shared-data-invalid-user.conf --- lightdm-1.9.12/tests/scripts/shared-data-invalid-user.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/shared-data-invalid-user.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/shared-data-session-to-greeter-autologin.conf lightdm-1.9.13/tests/scripts/shared-data-session-to-greeter-autologin.conf --- lightdm-1.9.12/tests/scripts/shared-data-session-to-greeter-autologin.conf 2014-03-04 02:37:38.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/shared-data-session-to-greeter-autologin.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -42,6 +43,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/shared-data-session-to-greeter.conf lightdm-1.9.13/tests/scripts/shared-data-session-to-greeter.conf --- lightdm-1.9.12/tests/scripts/shared-data-session-to-greeter.conf 2014-03-04 02:37:38.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/shared-data-session-to-greeter.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -31,6 +32,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -54,6 +56,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/surfaceflinger-autologin.conf lightdm-1.9.13/tests/scripts/surfaceflinger-autologin.conf --- lightdm-1.9.12/tests/scripts/surfaceflinger-autologin.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/surfaceflinger-autologin.conf 2014-03-17 20:08:24.000000000 +0000 @@ -12,6 +12,7 @@ # Session starts (test session doesn't know it's in surfaceflinger) #?SESSION-UNKNOWN START XDG_SEAT=seat0 XDG_VTNR=1 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=surfaceflinger USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 # Cleanup #?*STOP-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/switch-to-greeter.conf lightdm-1.9.13/tests/scripts/switch-to-greeter.conf --- lightdm-1.9.12/tests/scripts/switch-to-greeter.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-greeter.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -45,6 +46,7 @@ #?GREETER-X-1 CONNECTED-TO-DAEMON # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Cleanup diff -Nru lightdm-1.9.12/tests/scripts/switch-to-greeter-new-session.conf lightdm-1.9.13/tests/scripts/switch-to-greeter-new-session.conf --- lightdm-1.9.12/tests/scripts/switch-to-greeter-new-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-greeter-new-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -45,6 +46,7 @@ #?GREETER-X-1 CONNECTED-TO-DAEMON # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Login @@ -57,6 +59,7 @@ # New session starts #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2 +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/switch-to-greeter-return-session.conf lightdm-1.9.13/tests/scripts/switch-to-greeter-return-session.conf --- lightdm-1.9.12/tests/scripts/switch-to-greeter-return-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-greeter-return-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -45,6 +46,7 @@ #?GREETER-X-1 CONNECTED-TO-DAEMON # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Login as existing user @@ -58,6 +60,7 @@ #?LOGIN1 UNLOCK-SESSION # Switch to session +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?VT ACTIVATE VT=7 # Greeter and X server stop diff -Nru lightdm-1.9.12/tests/scripts/switch-to-greeter-return-session-logout.conf lightdm-1.9.13/tests/scripts/switch-to-greeter-return-session-logout.conf --- lightdm-1.9.12/tests/scripts/switch-to-greeter-return-session-logout.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-greeter-return-session-logout.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -45,6 +46,7 @@ #?GREETER-X-1 CONNECTED-TO-DAEMON # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Login as existing user @@ -58,6 +60,7 @@ #?LOGIN1 UNLOCK-SESSION # Switch to session +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?VT ACTIVATE VT=7 # Greeter and X server stop @@ -76,6 +79,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/switch-to-guest.conf lightdm-1.9.13/tests/scripts/switch-to-guest.conf --- lightdm-1.9.12/tests/scripts/switch-to-guest.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-guest.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Default session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -38,9 +39,6 @@ # Session is locked #?LOGIN1 LOCK-SESSION -# Switch to session -#?VT ACTIVATE VT=8 - # Guest account created #?GUEST-ACCOUNT ADD USERNAME=guest-.* @@ -49,9 +47,14 @@ #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER +# Switch to session +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 +#?VT ACTIVATE VT=8 + # Switch again, should not do anything as guest already running #?*SWITCH-TO-GUEST #?RUNNER SWITCH-TO-GUEST +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?*WAIT # Cleanup diff -Nru lightdm-1.9.12/tests/scripts/switch-to-user-active.conf lightdm-1.9.13/tests/scripts/switch-to-user-active.conf --- lightdm-1.9.12/tests/scripts/switch-to-user-active.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-user-active.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/switch-to-user.conf lightdm-1.9.13/tests/scripts/switch-to-user.conf --- lightdm-1.9.12/tests/scripts/switch-to-user.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-user.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -46,6 +47,7 @@ #?GREETER-X-1 CONNECTED-TO-DAEMON # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Requested user is automatically selected diff -Nru lightdm-1.9.12/tests/scripts/switch-to-user-existing.conf lightdm-1.9.13/tests/scripts/switch-to-user-existing.conf --- lightdm-1.9.12/tests/scripts/switch-to-user-existing.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-user-existing.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -44,6 +45,7 @@ #?SESSION-X-1 CONNECT-XSERVER # Switch to new session +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Switch back to first user @@ -58,6 +60,9 @@ #?XSERVER-2 INDICATE-READY #?XSERVER-2 ACCEPT-CONNECT +# New session is locked +#?LOGIN1 LOCK-SESSION + # Greeter starts #?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_SESSION_CLASS=greeter #?XSERVER-2 ACCEPT-CONNECT @@ -67,6 +72,7 @@ #?GREETER-X-2 SELECT-USER-HINT USERNAME=have-password1 # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?VT ACTIVATE VT=9 # Log into new account @@ -80,13 +86,11 @@ # Greeter X server terminates #?XSERVER-2 TERMINATE SIGNAL=15 -# New session is locked -#?LOGIN1 LOCK-SESSION - # Old session is unlocked #?LOGIN1 UNLOCK-SESSION # Switch to first session +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?VT ACTIVATE VT=7 # Cleanup diff -Nru lightdm-1.9.12/tests/scripts/switch-to-user-existing-no-password.conf lightdm-1.9.13/tests/scripts/switch-to-user-existing-no-password.conf --- lightdm-1.9.12/tests/scripts/switch-to-user-existing-no-password.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-user-existing-no-password.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -44,6 +45,7 @@ #?SESSION-X-1 CONNECT-XSERVER # Switch to new session +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Switch back to first user @@ -57,6 +59,7 @@ #?LOGIN1 LOCK-SESSION # Switch to first session +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?VT ACTIVATE VT=7 # Cleanup diff -Nru lightdm-1.9.12/tests/scripts/switch-to-user-logout-active.conf lightdm-1.9.13/tests/scripts/switch-to-user-logout-active.conf --- lightdm-1.9.12/tests/scripts/switch-to-user-logout-active.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-user-logout-active.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -44,6 +45,7 @@ #?SESSION-X-1 CONNECT-XSERVER # Switch to new session +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Log out new session @@ -60,6 +62,7 @@ # Greeter starts #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-1 ACCEPT-CONNECT #?GREETER-X-1 CONNECT-XSERVER #?GREETER-X-1 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/switch-to-user-logout-inactive.conf lightdm-1.9.13/tests/scripts/switch-to-user-logout-inactive.conf --- lightdm-1.9.12/tests/scripts/switch-to-user-logout-inactive.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-user-logout-inactive.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -44,6 +45,7 @@ #?SESSION-X-1 CONNECT-XSERVER # Switch to new session +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Log out old session diff -Nru lightdm-1.9.12/tests/scripts/switch-to-user-no-password.conf lightdm-1.9.13/tests/scripts/switch-to-user-no-password.conf --- lightdm-1.9.12/tests/scripts/switch-to-user-no-password.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-user-no-password.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -38,14 +39,15 @@ # Session is locked #?LOGIN1 LOCK-SESSION -# Switch to session -#?VT ACTIVATE VT=8 - # New session starts #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER +# Switch to session +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 +#?VT ACTIVATE VT=8 + # Cleanup #?*STOP-DAEMON #?SESSION-X-0 TERMINATE SIGNAL=15 diff -Nru lightdm-1.9.12/tests/scripts/switch-to-users.conf lightdm-1.9.13/tests/scripts/switch-to-users.conf --- lightdm-1.9.12/tests/scripts/switch-to-users.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/switch-to-users.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -38,14 +39,15 @@ # Session is locked #?LOGIN1 LOCK-SESSION -# Switch to session -#?VT ACTIVATE VT=8 - # New session starts #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER +# Switch to session +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 +#?VT ACTIVATE VT=8 + # Switch to another account without a password #?*SWITCH-TO-USER USERNAME=no-password2 #?RUNNER SWITCH-TO-USER USERNAME=no-password2 @@ -58,9 +60,6 @@ #?XSERVER-2 INDICATE-READY #?XSERVER-2 ACCEPT-CONNECT -# Switch to session -#?VT ACTIVATE VT=9 - # Session is locked #?LOGIN1 LOCK-SESSION @@ -69,6 +68,10 @@ #?XSERVER-2 ACCEPT-CONNECT #?SESSION-X-2 CONNECT-XSERVER +# Switch to session +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 +#?VT ACTIVATE VT=9 + # Cleanup #?*STOP-DAEMON #?SESSION-X-0 TERMINATE SIGNAL=15 diff -Nru lightdm-1.9.12/tests/scripts/system-xauthority.conf lightdm-1.9.13/tests/scripts/system-xauthority.conf --- lightdm-1.9.12/tests/scripts/system-xauthority.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/system-xauthority.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/unity-autologin.conf lightdm-1.9.13/tests/scripts/unity-autologin.conf --- lightdm-1.9.12/tests/scripts/unity-autologin.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-autologin.conf 2014-03-17 20:08:24.000000000 +0000 @@ -24,6 +24,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/unity-compositor-command.conf lightdm-1.9.13/tests/scripts/unity-compositor-command.conf --- lightdm-1.9.12/tests/scripts/unity-compositor-command.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-compositor-command.conf 2014-03-17 20:08:24.000000000 +0000 @@ -24,6 +24,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/unity-compositor-crash.conf lightdm-1.9.13/tests/scripts/unity-compositor-crash.conf --- lightdm-1.9.12/tests/scripts/unity-compositor-crash.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-compositor-crash.conf 2014-03-17 20:08:24.000000000 +0000 @@ -22,6 +22,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/unity-compositor-fallback.conf lightdm-1.9.13/tests/scripts/unity-compositor-fallback.conf --- lightdm-1.9.12/tests/scripts/unity-compositor-fallback.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-compositor-fallback.conf 2014-03-17 20:08:24.000000000 +0000 @@ -29,6 +29,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/unity-compositor-mir-next-session.conf lightdm-1.9.13/tests/scripts/unity-compositor-mir-next-session.conf --- lightdm-1.9.12/tests/scripts/unity-compositor-mir-next-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-compositor-mir-next-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -17,11 +17,13 @@ # Greeter session #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON # Background session #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=mir USER=have-password2 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 # System compositor switches to greeter #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=greeter-0 diff -Nru lightdm-1.9.12/tests/scripts/unity-compositor-next-session.conf lightdm-1.9.13/tests/scripts/unity-compositor-next-session.conf --- lightdm-1.9.12/tests/scripts/unity-compositor-next-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-compositor-next-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -32,6 +33,7 @@ #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/unity-login.conf lightdm-1.9.13/tests/scripts/unity-login.conf --- lightdm-1.9.12/tests/scripts/unity-login.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-login.conf 2014-03-17 20:08:24.000000000 +0000 @@ -23,6 +23,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -41,6 +42,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/unity-mir-autologin.conf lightdm-1.9.13/tests/scripts/unity-mir-autologin.conf --- lightdm-1.9.12/tests/scripts/unity-mir-autologin.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-mir-autologin.conf 2014-03-17 20:08:24.000000000 +0000 @@ -16,6 +16,7 @@ # Session starts #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 # System compositor switches to session #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0 diff -Nru lightdm-1.9.12/tests/scripts/unity-mir-greeter-mir-session.conf lightdm-1.9.13/tests/scripts/unity-mir-greeter-mir-session.conf --- lightdm-1.9.12/tests/scripts/unity-mir-greeter-mir-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-mir-greeter-mir-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON @@ -28,6 +29,7 @@ # Session starts #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 # System compositor switches to session #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0 diff -Nru lightdm-1.9.12/tests/scripts/unity-mir-greeter-x-session.conf lightdm-1.9.13/tests/scripts/unity-mir-greeter-x-session.conf --- lightdm-1.9.12/tests/scripts/unity-mir-greeter-x-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-mir-greeter-x-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON @@ -36,6 +37,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/unity-mir-lock-seat.conf lightdm-1.9.13/tests/scripts/unity-mir-lock-seat.conf --- lightdm-1.9.12/tests/scripts/unity-mir-lock-seat.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-mir-lock-seat.conf 2014-03-17 20:08:24.000000000 +0000 @@ -16,6 +16,7 @@ # Session starts #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 # System compositor switches to session #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0 @@ -29,6 +30,7 @@ # Greeter starts #?GREETER-MIR-greeter-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?GREETER-MIR-greeter-0 CONNECT-TO-DAEMON #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON #?GREETER-MIR-greeter-0 LOCK-HINT diff -Nru lightdm-1.9.12/tests/scripts/unity-mir-session-x-greeter.conf lightdm-1.9.13/tests/scripts/unity-mir-session-x-greeter.conf --- lightdm-1.9.12/tests/scripts/unity-mir-session-x-greeter.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-mir-session-x-greeter.conf 2014-03-17 20:08:24.000000000 +0000 @@ -23,6 +23,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -38,6 +39,7 @@ # Session starts #?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 # System compositor switches to session #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0 diff -Nru lightdm-1.9.12/tests/scripts/unity-plymouth.conf lightdm-1.9.13/tests/scripts/unity-plymouth.conf --- lightdm-1.9.12/tests/scripts/unity-plymouth.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-plymouth.conf 2014-03-17 20:08:24.000000000 +0000 @@ -34,6 +34,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/unity-switch.conf lightdm-1.9.13/tests/scripts/unity-switch.conf --- lightdm-1.9.12/tests/scripts/unity-switch.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-switch.conf 2014-03-17 20:08:24.000000000 +0000 @@ -24,6 +24,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -47,6 +48,7 @@ # Greeter starts #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-1 ACCEPT-CONNECT #?GREETER-X-1 CONNECT-XSERVER #?GREETER-X-1 CONNECT-TO-DAEMON @@ -65,6 +67,7 @@ # New session starts #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2 +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER @@ -80,6 +83,7 @@ # Greeter starts #?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c3 #?XSERVER-2 ACCEPT-CONNECT #?GREETER-X-2 CONNECT-XSERVER #?GREETER-X-2 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/unity-xdg-seat.conf lightdm-1.9.13/tests/scripts/unity-xdg-seat.conf --- lightdm-1.9.12/tests/scripts/unity-xdg-seat.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/unity-xdg-seat.conf 2014-03-17 20:08:24.000000000 +0000 @@ -25,6 +25,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat1 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/upstart-autologin.conf lightdm-1.9.13/tests/scripts/upstart-autologin.conf --- lightdm-1.9.12/tests/scripts/upstart-autologin.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/upstart-autologin.conf 2014-03-17 20:08:24.000000000 +0000 @@ -25,6 +25,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/upstart-login.conf lightdm-1.9.13/tests/scripts/upstart-login.conf --- lightdm-1.9.12/tests/scripts/upstart-login.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/upstart-login.conf 2014-03-17 20:08:24.000000000 +0000 @@ -23,6 +23,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -40,6 +41,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/user-background.conf lightdm-1.9.13/tests/scripts/user-background.conf --- lightdm-1.9.12/tests/scripts/user-background.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/user-background.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/user-has-messages.conf lightdm-1.9.13/tests/scripts/user-has-messages.conf --- lightdm-1.9.12/tests/scripts/user-has-messages.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/user-has-messages.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/user-image.conf lightdm-1.9.13/tests/scripts/user-image.conf --- lightdm-1.9.12/tests/scripts/user-image.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/user-image.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/user-layout.conf lightdm-1.9.13/tests/scripts/user-layout.conf --- lightdm-1.9.12/tests/scripts/user-layout.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/user-layout.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/user-logged-in.conf lightdm-1.9.13/tests/scripts/user-logged-in.conf --- lightdm-1.9.12/tests/scripts/user-logged-in.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/user-logged-in.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -38,6 +39,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=default USER=prop-user +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -64,6 +66,7 @@ #?GREETER-X-1 CONNECTED-TO-DAEMON # Switch to greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?VT ACTIVATE VT=8 # Watch a user for properties changes diff -Nru lightdm-1.9.12/tests/scripts/user-name.conf lightdm-1.9.13/tests/scripts/user-name.conf --- lightdm-1.9.12/tests/scripts/user-name.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/user-name.conf 2014-03-17 20:08:24.000000000 +0000 @@ -15,6 +15,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/user-renamed.conf lightdm-1.9.13/tests/scripts/user-renamed.conf --- lightdm-1.9.12/tests/scripts/user-renamed.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/user-renamed.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/change-user2 DESKTOP_SESSION=default USER=change-user2 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/user-renamed-invalid.conf lightdm-1.9.13/tests/scripts/user-renamed-invalid.conf --- lightdm-1.9.12/tests/scripts/user-renamed-invalid.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/user-renamed-invalid.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/users.conf lightdm-1.9.13/tests/scripts/users.conf --- lightdm-1.9.12/tests/scripts/users.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/users.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/user-session.conf lightdm-1.9.13/tests/scripts/user-session.conf --- lightdm-1.9.12/tests/scripts/user-session.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/user-session.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -38,6 +39,7 @@ # Session starts, check it uses the default session #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=default USER=prop-user +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -55,6 +57,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -83,6 +86,7 @@ # Session starts, check it uses the updated session #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=alternative NAME=alternative USER=prop-user +#?LOGIN1 ACTIVATE-SESSION SESSION=c3 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/utmp-autologin.conf lightdm-1.9.13/tests/scripts/utmp-autologin.conf --- lightdm-1.9.12/tests/scripts/utmp-autologin.conf 2014-03-11 01:50:47.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/utmp-autologin.conf 2014-03-17 20:08:24.000000000 +0000 @@ -26,6 +26,7 @@ # Autologin session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -49,6 +50,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/utmp-login.conf lightdm-1.9.13/tests/scripts/utmp-login.conf --- lightdm-1.9.12/tests/scripts/utmp-login.conf 2014-03-11 01:50:47.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/utmp-login.conf 2014-03-17 20:08:24.000000000 +0000 @@ -21,6 +21,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -40,6 +41,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER @@ -63,6 +65,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c2 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/utmp-wrong-password.conf lightdm-1.9.13/tests/scripts/utmp-wrong-password.conf --- lightdm-1.9.12/tests/scripts/utmp-wrong-password.conf 2014-03-11 01:50:47.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/utmp-wrong-password.conf 2014-03-17 20:08:24.000000000 +0000 @@ -18,6 +18,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/vnc-command.conf lightdm-1.9.13/tests/scripts/vnc-command.conf --- lightdm-1.9.12/tests/scripts/vnc-command.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/vnc-command.conf 2014-03-17 20:08:24.000000000 +0000 @@ -34,6 +34,7 @@ # Greeter starts and connects to remote X server #?GREETER-X-0 START XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/vnc-dimensions.conf lightdm-1.9.13/tests/scripts/vnc-dimensions.conf --- lightdm-1.9.12/tests/scripts/vnc-dimensions.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/vnc-dimensions.conf 2014-03-17 20:08:24.000000000 +0000 @@ -36,6 +36,7 @@ # Greeter starts and connects to remote X server #?GREETER-X-0 START XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON diff -Nru lightdm-1.9.12/tests/scripts/vnc-login.conf lightdm-1.9.13/tests/scripts/vnc-login.conf --- lightdm-1.9.12/tests/scripts/vnc-login.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/vnc-login.conf 2014-03-17 20:08:24.000000000 +0000 @@ -38,6 +38,7 @@ # Greeter starts and connects to remote X server #?GREETER-X-0 START XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -53,6 +54,7 @@ # Session starts #?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/vnc-open-file-descriptors.conf lightdm-1.9.13/tests/scripts/vnc-open-file-descriptors.conf --- lightdm-1.9.12/tests/scripts/vnc-open-file-descriptors.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/vnc-open-file-descriptors.conf 2014-03-17 20:08:24.000000000 +0000 @@ -37,6 +37,7 @@ # Greeter starts and connects to remote X server #?GREETER-X-0 START XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -52,6 +53,7 @@ # Session starts #?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/xauthority.conf lightdm-1.9.13/tests/scripts/xauthority.conf --- lightdm-1.9.12/tests/scripts/xauthority.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/xauthority.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/xdg-current-desktop.conf lightdm-1.9.13/tests/scripts/xdg-current-desktop.conf --- lightdm-1.9.12/tests/scripts/xdg-current-desktop.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/xdg-current-desktop.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=named USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/xdg-seat.conf lightdm-1.9.13/tests/scripts/xdg-seat.conf --- lightdm-1.9.12/tests/scripts/xdg-seat.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/xdg-seat.conf 2014-03-17 20:08:24.000000000 +0000 @@ -20,6 +20,7 @@ # Session starts #?SESSION-X-0 START XDG_SEAT=seat1 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/xdmcp-server-login.conf lightdm-1.9.13/tests/scripts/xdmcp-server-login.conf --- lightdm-1.9.12/tests/scripts/xdmcp-server-login.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/xdmcp-server-login.conf 2014-03-17 20:08:24.000000000 +0000 @@ -35,6 +35,7 @@ # Greeter starts and connects to remote X server #?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-98 ACCEPT-CONNECT #?GREETER-X-127.0.0.1:98 CONNECT-XSERVER #?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON @@ -50,6 +51,7 @@ # Session starts #?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-98 ACCEPT-CONNECT #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/xdmcp-server-open-file-descriptors.conf lightdm-1.9.13/tests/scripts/xdmcp-server-open-file-descriptors.conf --- lightdm-1.9.12/tests/scripts/xdmcp-server-open-file-descriptors.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/xdmcp-server-open-file-descriptors.conf 2014-03-17 20:08:24.000000000 +0000 @@ -35,6 +35,7 @@ # Greeter starts and connects to remote X server #?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-98 ACCEPT-CONNECT #?GREETER-X-127.0.0.1:98 CONNECT-XSERVER #?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON @@ -50,6 +51,7 @@ # Session starts #?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-98 ACCEPT-CONNECT #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER diff -Nru lightdm-1.9.12/tests/scripts/xserver-no-share.conf lightdm-1.9.13/tests/scripts/xserver-no-share.conf --- lightdm-1.9.12/tests/scripts/xserver-no-share.conf 2014-02-26 20:50:41.000000000 +0000 +++ lightdm-1.9.13/tests/scripts/xserver-no-share.conf 2014-03-17 20:08:24.000000000 +0000 @@ -19,6 +19,7 @@ # Greeter starts #?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON @@ -45,6 +46,7 @@ #?SESSION-X-1 CONNECT-XSERVER # Switch to session +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?VT ACTIVATE VT=8 # Greeter stops diff -Nru lightdm-1.9.12/tests/src/libsystem.c lightdm-1.9.13/tests/src/libsystem.c --- lightdm-1.9.12/tests/src/libsystem.c 2014-03-11 01:50:47.000000000 +0000 +++ lightdm-1.9.13/tests/src/libsystem.c 2014-03-18 04:25:24.000000000 +0000 @@ -195,6 +195,12 @@ if (g_str_has_prefix (path, "/tmp")) return g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", path + strlen ("/tmp"), NULL); + if (g_str_has_prefix (path, "/etc/xdg")) + return g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "etc", "xdg", path + strlen ("/etc/xdg"), NULL); + + if (g_str_has_prefix (path, "/usr/share/lightdm")) + return g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "usr", "share", "lightdm", path + strlen ("/usr/share/lightdm"), NULL); + return g_strdup (path); } diff -Nru lightdm-1.9.12/tests/src/test-runner.c lightdm-1.9.13/tests/src/test-runner.c --- lightdm-1.9.12/tests/src/test-runner.c 2014-03-05 03:11:33.000000000 +0000 +++ lightdm-1.9.13/tests/src/test-runner.c 2014-03-18 04:25:24.000000000 +0000 @@ -1109,7 +1109,7 @@ for (link = ck_sessions; link; link = link->next) { CKSession *session = link->data; - if (strcmp (session->cookie, cookie) != 0) + if (strcmp (session->cookie, cookie) == 0) { g_dbus_method_invocation_return_value (invocation, g_variant_new ("(o)", session->path)); return; @@ -1158,6 +1158,14 @@ session->locked = FALSE; g_dbus_method_invocation_return_value (invocation, g_variant_new ("()")); } + else if (strcmp (method_name, "Activate") == 0) + { + gchar *status = g_strdup_printf ("CONSOLE-KIT ACTIVATE-SESSION SESSION=%s", session->cookie); + check_status (status); + g_free (status); + + g_dbus_method_invocation_return_value (invocation, g_variant_new ("()")); + } else g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name); } @@ -1210,6 +1218,7 @@ " " " " " " + " " " " ""; GDBusNodeInfo *ck_info; @@ -1285,6 +1294,14 @@ session->locked = FALSE; g_dbus_method_invocation_return_value (invocation, g_variant_new ("()")); } + else if (strcmp (method_name, "Activate") == 0) + { + gchar *status = g_strdup_printf ("LOGIN1 ACTIVATE-SESSION SESSION=%s", strrchr (object_path, '/') + 1); + check_status (status); + g_free (status); + + g_dbus_method_invocation_return_value (invocation, g_variant_new ("()")); + } else g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name); } @@ -1302,6 +1319,7 @@ " " " " " " + " " " " ""; static const GDBusInterfaceVTable login1_session_vtable = @@ -1977,6 +1995,10 @@ /* Don't contact our X server */ g_unsetenv ("DISPLAY"); + /* Don't let XDG vars from system affect tests */ + g_unsetenv ("XDG_CONFIG_DIRS"); + g_unsetenv ("XDG_DATA_DIRS"); + /* Override system calls */ ld_preload = g_build_filename (BUILDDIR, "tests", "src", ".libs", "libsystem.so", NULL); g_setenv ("LD_PRELOAD", ld_preload, TRUE); @@ -2090,11 +2112,11 @@ { gchar **files; - g_mkdir_with_parents (g_strdup_printf ("%s/etc/lightdm/lightdm.conf.d", temp_dir), 0755); + g_mkdir_with_parents (g_strdup_printf ("%s/etc/xdg/lightdm/lightdm.conf.d", temp_dir), 0755); files = g_strsplit (additional_config, " ", -1); for (i = 0; files[i]; i++) - if (system (g_strdup_printf ("cp %s/tests/scripts/%s %s/etc/lightdm/lightdm.conf.d", SRCDIR, files[i], temp_dir))) + if (system (g_strdup_printf ("cp %s/tests/scripts/%s %s/etc/xdg/lightdm/lightdm.conf.d", SRCDIR, files[i], temp_dir))) perror ("Failed to copy configuration"); g_strfreev (files); }