diff options
| author | Jesús González <jgonzalez@gdr-sistemas.com> | 2015-06-01 23:14:07 +0200 |
|---|---|---|
| committer | Jesús González <jgonzalez@gdr-sistemas.com> | 2015-06-01 23:14:07 +0200 |
| commit | b7778d2853d781998a4c6e8733c9cf76b7b6588e (patch) | |
| tree | bec777cb0e55e436a3a62ab88564895f6494acce | |
| parent | 1afa5d0f606763524225dea9c5d0a953f808adf7 (diff) | |
| parent | 89c9af9a315de9d88cac40e15f08899ad78b9bf7 (diff) | |
| download | lightdm-b7778d2853d781998a4c6e8733c9cf76b7b6588e.tar.gz | |
Merged parent branch
131 files changed, 793 insertions, 355 deletions
@@ -73,4 +73,5 @@ tests/src/test-session tests/src/unity-system-compositor tests/src/vnc-client tests/src/X +tests/src/Xmir tests/src/Xvnc @@ -1,3 +1,8 @@ +Overview of changes in lightdm 1.15.0 + + * Deprecate [SeatDefaults] in favour of [Seat:*] + * Use new Xmir binary when running X under Unity System Compositor + Overview of changes in lightdm 1.14.0 * Initialize file descriptor handles so we don't attempt to close stdin by diff --git a/common/configuration.c b/common/configuration.c index 1ef64490..f456faaf 100644 --- a/common/configuration.c +++ b/common/configuration.c @@ -56,6 +56,9 @@ config_load_from_file (Configuration *config, const gchar *path, GError **error) gchar **keys; int j; + if (strcmp (groups[i], "SeatDefaults") == 0) + g_printerr ("Configuration file %s contains a deprecated [SeatDefaults] section, use [Seat:*] instead\n", path); + keys = g_key_file_get_keys (key_file, groups[i], NULL, error); if (!keys) break; diff --git a/configure.ac b/configure.ac index 80c699b0..9a7b0be9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.14.0) +AC_INIT(lightdm, 1.15.0) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) diff --git a/data/lightdm.conf b/data/lightdm.conf index d321175d..2372a53f 100644 --- a/data/lightdm.conf +++ b/data/lightdm.conf @@ -43,6 +43,7 @@ # pam-autologin-service = PAM service to use for autologin # pam-greeter-service = PAM service to use for greeters # xserver-command = X server command to run (can also contain arguments e.g. X -special-option) +# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option) # xserver-layout = Layout to pass to X server # xserver-config = Config file to pass to X server # xserver-allow-tcp = True if TCP/IP connections are allowed to this X server @@ -84,6 +85,7 @@ #pam-autologin-service=lightdm-autologin #pam-greeter-service=lightdm-greeter #xserver-command=X +#xmir-command=Xmir #xserver-layout= #xserver-config= #xserver-allow-tcp=false diff --git a/debian/changelog b/debian/changelog index d054ebdc..aae7742b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +lightdm (1.15.0-0ubuntu1) wily; urgency=medium + + * New upstream release: + - Deprecate [SeatDefaults] in favour of [Seat:*] + - Use new Xmir binary when running X under Unity System Compositor + + -- Robert Ancell <robert.ancell@canonical.com> Mon, 18 May 2015 13:38:23 +1200 + lightdm (1.14.0-0ubuntu2) vivid; urgency=medium * Quiesce initctl errors when not running under upstart. (LP: #1414420) diff --git a/debian/lightdm-session b/debian/lightdm-session index 4d3020b1..dd5cd398 100644 --- a/debian/lightdm-session +++ b/debian/lightdm-session @@ -47,15 +47,15 @@ if type xrdb >/dev/null 2>&1; then if [ -d "$xresourcedir" ]; then for file in $xresourcedir/*; do echo "Loading resource: $file" - xrdb -nocpp -merge "$file" + xrdb -merge "$file" done fi xresourcefile="$HOME/.Xresources" if [ -f "$xresourcefile" ]; then echo "Loading resource: $xresourcefile" - xrdb -nocpp -merge "$xresourcefile" + xrdb -merge "$xresourcefile" fi -fi +fi # Load keymaps if type setxkbmap >/dev/null 2>&1; then diff --git a/debian/po/af.po b/debian/po/af.po index ca459ff9..2795b91e 100644 --- a/debian/po/af.po +++ b/debian/po/af.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/am.po b/debian/po/am.po index 42a25e6f..69e6e307 100644 --- a/debian/po/am.po +++ b/debian/po/am.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/an.po b/debian/po/an.po index 2094e0b0..fb338925 100644 --- a/debian/po/an.po +++ b/debian/po/an.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ar.po b/debian/po/ar.po index 4de437c6..e1e18b84 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ast.po b/debian/po/ast.po index c71e8f7a..064cded3 100644 --- a/debian/po/ast.po +++ b/debian/po/ast.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/az.po b/debian/po/az.po index 8b6e956b..c349be9b 100644 --- a/debian/po/az.po +++ b/debian/po/az.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/be.po b/debian/po/be.po index a73fb7e3..b0244c18 100644 --- a/debian/po/be.po +++ b/debian/po/be.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/bg.po b/debian/po/bg.po index 5896518b..01a077d4 100644 --- a/debian/po/bg.po +++ b/debian/po/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/bn.po b/debian/po/bn.po index 716879ea..96964545 100644 --- a/debian/po/bn.po +++ b/debian/po/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/bo.po b/debian/po/bo.po index e1063a76..011dba0c 100644 --- a/debian/po/bo.po +++ b/debian/po/bo.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/br.po b/debian/po/br.po index 86035328..526fd04e 100644 --- a/debian/po/br.po +++ b/debian/po/br.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/bs.po b/debian/po/bs.po index 8c12e7e5..6f51c75f 100644 --- a/debian/po/bs.po +++ b/debian/po/bs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ca.po b/debian/po/ca.po index 92e31aa9..f92f533b 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ca@valencia.po b/debian/po/ca@valencia.po index 6570bc80..456ba9b4 100644 --- a/debian/po/ca@valencia.po +++ b/debian/po/ca@valencia.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ce.po b/debian/po/ce.po index 26816cc3..9200c04a 100644 --- a/debian/po/ce.po +++ b/debian/po/ce.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ckb.po b/debian/po/ckb.po index 70315cd4..e6d840c2 100644 --- a/debian/po/ckb.po +++ b/debian/po/ckb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/cs.po b/debian/po/cs.po index e2694fc5..2fc63765 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/cy.po b/debian/po/cy.po index 71aaf46b..e55d07c6 100644 --- a/debian/po/cy.po +++ b/debian/po/cy.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/da.po b/debian/po/da.po index 125103ae..9babe70b 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/de.po b/debian/po/de.po index a046d113..de4a4b88 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/el.po b/debian/po/el.po index 72c941d9..a1e64feb 100644 --- a/debian/po/el.po +++ b/debian/po/el.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/en_AU.po b/debian/po/en_AU.po index d73720f8..c4d91b74 100644 --- a/debian/po/en_AU.po +++ b/debian/po/en_AU.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/en_CA.po b/debian/po/en_CA.po index 5700d92f..17d0a8e1 100644 --- a/debian/po/en_CA.po +++ b/debian/po/en_CA.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po index d320afd6..df588b50 100644 --- a/debian/po/en_GB.po +++ b/debian/po/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/eo.po b/debian/po/eo.po index 8cf76403..e2b7cbc2 100644 --- a/debian/po/eo.po +++ b/debian/po/eo.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/es.po b/debian/po/es.po index 1b51ad29..5cfafeb9 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/et.po b/debian/po/et.po index c079a7ac..86725ccc 100644 --- a/debian/po/et.po +++ b/debian/po/et.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/eu.po b/debian/po/eu.po index f3aa083f..5a02832c 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/fa.po b/debian/po/fa.po index 37ec3eb8..6a6137c9 100644 --- a/debian/po/fa.po +++ b/debian/po/fa.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/fi.po b/debian/po/fi.po index 5e16981e..edfe1f6b 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/fo.po b/debian/po/fo.po index 436cafe5..e8294664 100644 --- a/debian/po/fo.po +++ b/debian/po/fo.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/fr.po b/debian/po/fr.po index 972e864d..e2c94aaf 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/fr_CA.po b/debian/po/fr_CA.po index 0fb4e814..c87d11de 100644 --- a/debian/po/fr_CA.po +++ b/debian/po/fr_CA.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/fy.po b/debian/po/fy.po index bf2933fb..511a7775 100644 --- a/debian/po/fy.po +++ b/debian/po/fy.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ga.po b/debian/po/ga.po index ee593ffd..810b3bf6 100644 --- a/debian/po/ga.po +++ b/debian/po/ga.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/gd.po b/debian/po/gd.po index 523c8195..b22ee84d 100644 --- a/debian/po/gd.po +++ b/debian/po/gd.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/gl.po b/debian/po/gl.po index 3f8dcf5f..e131f3b4 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/gu.po b/debian/po/gu.po index c54a49bf..d84cfe73 100644 --- a/debian/po/gu.po +++ b/debian/po/gu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/he.po b/debian/po/he.po index a5fd5bca..c7817305 100644 --- a/debian/po/he.po +++ b/debian/po/he.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/hi.po b/debian/po/hi.po index 374e453f..0e18c2fb 100644 --- a/debian/po/hi.po +++ b/debian/po/hi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/hr.po b/debian/po/hr.po index ebdb2316..2839b5d6 100644 --- a/debian/po/hr.po +++ b/debian/po/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ht.po b/debian/po/ht.po index 15448c6d..33b8b0e0 100644 --- a/debian/po/ht.po +++ b/debian/po/ht.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/hu.po b/debian/po/hu.po index 21702c68..8c5d5dca 100644 --- a/debian/po/hu.po +++ b/debian/po/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/hy.po b/debian/po/hy.po index 1b9b277e..8a948148 100644 --- a/debian/po/hy.po +++ b/debian/po/hy.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ia.po b/debian/po/ia.po index 3896dc94..ca7472eb 100644 --- a/debian/po/ia.po +++ b/debian/po/ia.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/id.po b/debian/po/id.po index 57ec0aa5..9af00449 100644 --- a/debian/po/id.po +++ b/debian/po/id.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/is.po b/debian/po/is.po index 9d0bc2a8..46f0aef2 100644 --- a/debian/po/is.po +++ b/debian/po/is.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/it.po b/debian/po/it.po index fc00ec1d..453dd96c 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ja.po b/debian/po/ja.po index af8008a2..4a02d124 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/kk.po b/debian/po/kk.po index 9a57b589..3118f568 100644 --- a/debian/po/kk.po +++ b/debian/po/kk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/kl.po b/debian/po/kl.po index f3385383..d873f11c 100644 --- a/debian/po/kl.po +++ b/debian/po/kl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/km.po b/debian/po/km.po index 26bcc22b..b0200204 100644 --- a/debian/po/km.po +++ b/debian/po/km.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/kn.po b/debian/po/kn.po index 59b9c3b8..8afa0715 100644 --- a/debian/po/kn.po +++ b/debian/po/kn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ko.po b/debian/po/ko.po index 028e2a4b..616f1daa 100644 --- a/debian/po/ko.po +++ b/debian/po/ko.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ku.po b/debian/po/ku.po index ad0672d8..04016b2a 100644 --- a/debian/po/ku.po +++ b/debian/po/ku.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/lb.po b/debian/po/lb.po index 00d57306..09750db0 100644 --- a/debian/po/lb.po +++ b/debian/po/lb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/lt.po b/debian/po/lt.po index 98ea09e8..f4503d7b 100644 --- a/debian/po/lt.po +++ b/debian/po/lt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/lv.po b/debian/po/lv.po index 067ecde8..10df1c61 100644 --- a/debian/po/lv.po +++ b/debian/po/lv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/mhr.po b/debian/po/mhr.po index 80d9ffe0..f77bcd83 100644 --- a/debian/po/mhr.po +++ b/debian/po/mhr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/mi.po b/debian/po/mi.po index 88df85b9..e33045a7 100644 --- a/debian/po/mi.po +++ b/debian/po/mi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ml.po b/debian/po/ml.po index 1e2ba50f..303dd3b8 100644 --- a/debian/po/ml.po +++ b/debian/po/ml.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/mr.po b/debian/po/mr.po index e09ddc00..c07c1932 100644 --- a/debian/po/mr.po +++ b/debian/po/mr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ms.po b/debian/po/ms.po index e35c9716..d5b58a81 100644 --- a/debian/po/ms.po +++ b/debian/po/ms.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/my.po b/debian/po/my.po index 84ff47d9..a0a8b6b1 100644 --- a/debian/po/my.po +++ b/debian/po/my.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/nb.po b/debian/po/nb.po index c4091362..af2e6a7d 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/nl.po b/debian/po/nl.po index 982238d4..48d57ce4 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/nn.po b/debian/po/nn.po index a284eae6..55648521 100644 --- a/debian/po/nn.po +++ b/debian/po/nn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/oc.po b/debian/po/oc.po index 4a125cab..1b640eb1 100644 --- a/debian/po/oc.po +++ b/debian/po/oc.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/pa.po b/debian/po/pa.po index 347e3879..df7c6a5c 100644 --- a/debian/po/pa.po +++ b/debian/po/pa.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/pl.po b/debian/po/pl.po index 61aa36e2..8e07d859 100644 --- a/debian/po/pl.po +++ b/debian/po/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/pt.po b/debian/po/pt.po index a77bde57..5ba729cc 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 51277570..dffda18b 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ro.po b/debian/po/ro.po index 5d97c299..59c9b462 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ru.po b/debian/po/ru.po index 91ae2972..4dce337c 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/sc.po b/debian/po/sc.po index 0c2507d3..3f01408a 100644 --- a/debian/po/sc.po +++ b/debian/po/sc.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/sd.po b/debian/po/sd.po index 8d19b0ef..344820f6 100644 --- a/debian/po/sd.po +++ b/debian/po/sd.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/shn.po b/debian/po/shn.po index 6f2fedfb..afe84509 100644 --- a/debian/po/shn.po +++ b/debian/po/shn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/si.po b/debian/po/si.po index 82788cc1..29430e86 100644 --- a/debian/po/si.po +++ b/debian/po/si.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/sk.po b/debian/po/sk.po index 746c5e7e..afbcb23f 100644 --- a/debian/po/sk.po +++ b/debian/po/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/sl.po b/debian/po/sl.po index f6898c71..53caa431 100644 --- a/debian/po/sl.po +++ b/debian/po/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/sq.po b/debian/po/sq.po index 323e95be..9ca53757 100644 --- a/debian/po/sq.po +++ b/debian/po/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/sr.po b/debian/po/sr.po index b244b100..cb8e7445 100644 --- a/debian/po/sr.po +++ b/debian/po/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" "Language: sr\n" #. Type: select diff --git a/debian/po/sv.po b/debian/po/sv.po index b5c2b721..34982b01 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ta.po b/debian/po/ta.po index 942b3c92..4a674617 100644 --- a/debian/po/ta.po +++ b/debian/po/ta.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/te.po b/debian/po/te.po index e5b8fd60..9e16feb0 100644 --- a/debian/po/te.po +++ b/debian/po/te.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/tg.po b/debian/po/tg.po index 59cb5456..1fc7f7b0 100644 --- a/debian/po/tg.po +++ b/debian/po/tg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/th.po b/debian/po/th.po index f4c73ae7..41d497d9 100644 --- a/debian/po/th.po +++ b/debian/po/th.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/tl.po b/debian/po/tl.po index e9a685a5..de8b1f38 100644 --- a/debian/po/tl.po +++ b/debian/po/tl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/tr.po b/debian/po/tr.po index 1e6dc50d..25823704 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ug.po b/debian/po/ug.po index fff6b4e1..a31840d5 100644 --- a/debian/po/ug.po +++ b/debian/po/ug.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/uk.po b/debian/po/uk.po index 05f7c40c..aa97cff0 100644 --- a/debian/po/uk.po +++ b/debian/po/uk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/ur.po b/debian/po/ur.po index 52da4836..3fb88966 100644 --- a/debian/po/ur.po +++ b/debian/po/ur.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/uz.po b/debian/po/uz.po index 0eeda05d..e6c8c403 100644 --- a/debian/po/uz.po +++ b/debian/po/uz.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/vi.po b/debian/po/vi.po index 56c8b7ce..4d7fd0f6 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/wae.po b/debian/po/wae.po index 3e57bbf2..d3f64df7 100644 --- a/debian/po/wae.po +++ b/debian/po/wae.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po index e4f10b1e..7ef8209d 100644 --- a/debian/po/zh_CN.po +++ b/debian/po/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/zh_HK.po b/debian/po/zh_HK.po index 3f193c69..ac60a035 100644 --- a/debian/po/zh_HK.po +++ b/debian/po/zh_HK.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po index 57d9e17d..df30889b 100644 --- a/debian/po/zh_TW.po +++ b/debian/po/zh_TW.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n" -"X-Generator: Launchpad (build 17430)\n" +"X-Launchpad-Export-Date: 2015-05-22 04:47+0000\n" +"X-Generator: Launchpad (build 17514)\n" #. Type: select #. Description diff --git a/src/lightdm.c b/src/lightdm.c index 61ae3f2c..f2c300f2 100644 --- a/src/lightdm.c +++ b/src/lightdm.c @@ -153,13 +153,14 @@ get_config_sections (const gchar *seat_name) gchar **groups, **i; GList *config_sections = NULL; - /* Keep this so it won't break existing config files using old [SeatDefaults] */ + /* Load seat defaults first and support old method of [SeatDefaults] */ + config_sections = g_list_append (config_sections, g_strdup ("Seat:*")); config_sections = g_list_append (config_sections, g_strdup ("SeatDefaults")); groups = config_get_groups (config_get_instance ()); for (i = groups; *i; i++) { - if (g_str_has_prefix (*i, "Seat:")) + if (g_str_has_prefix (*i, "Seat:") && strcmp (*i, "Seat:*") != 0) { const gchar *seat_name_glob = *i + strlen ("Seat:"); if (g_pattern_match_simple (seat_name_glob, seat_name ? seat_name : "")) @@ -184,10 +185,6 @@ set_seat_properties (Seat *seat, const gchar *seat_name) const gchar *section = link->data; keys = config_get_keys (config_get_instance (), section); - /* Keep this until [SeatDefaults] support is definitely removed */ - if (strcmp (section, "SeatDefaults") == 0 && keys) - l_warning (seat, "[SeatDefaults] is deprecated and won't be supported in the future. Use [Seat:*] instead!"); - l_debug (seat, "Loading properties from config section %s", section); for (i = 0; keys && keys[i]; i++) { @@ -1382,6 +1379,8 @@ main (int argc, char **argv) config_set_string (config_get_instance (), "Seat:*", "pam-greeter-service", "lightdm-greeter"); if (!config_has_key (config_get_instance (), "Seat:*", "xserver-command")) config_set_string (config_get_instance (), "Seat:*", "xserver-command", "X"); + if (!config_has_key (config_get_instance (), "Seat:*", "xmir-command")) + config_set_string (config_get_instance (), "Seat:*", "xmir-command", "Xmir"); if (!config_has_key (config_get_instance (), "Seat:*", "xserver-share")) config_set_boolean (config_get_instance (), "Seat:*", "xserver-share", TRUE); if (!config_has_key (config_get_instance (), "Seat:*", "unity-compositor-command")) diff --git a/src/seat-unity.c b/src/seat-unity.c index 32d30b23..642be0aa 100644 --- a/src/seat-unity.c +++ b/src/seat-unity.c @@ -203,9 +203,11 @@ create_x_server (Seat *seat) x_server = x_server_local_new (); - command = seat_get_string_property (seat, "xserver-command"); - if (command) - x_server_local_set_command (x_server, command); + command = seat_get_string_property (seat, "xmir-command"); + /* Fall back to using X if Xmir is not available as this was the previous way XMir worked */ + if (strcmp (command, "Xmir") == 0 && !g_find_program_in_path ("Xmir")) + command = seat_get_string_property (seat, "xserver-command"); + x_server_local_set_command (x_server, command); id = g_strdup_printf ("x-%d", SEAT_UNITY (seat)->priv->next_x_server_id); SEAT_UNITY (seat)->priv->next_x_server_id++; diff --git a/tests/Makefile.am b/tests/Makefile.am index d82c0fe3..93a09ad9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -209,6 +209,7 @@ TESTS = \ test-unity-compositor-next-session \ test-unity-compositor-mir-next-session \ test-unity-autologin \ + test-unity-autologin-legacy \ test-unity-login \ test-unity-switch \ test-unity-plymouth \ @@ -526,6 +527,7 @@ EXTRA_DIST = \ scripts/switch-to-user-resettable.conf \ scripts/system-xauthority.conf \ scripts/unity-autologin.conf \ + scripts/unity-autologin-legacy.conf \ scripts/unity-compositor-command.conf \ scripts/unity-compositor-crash.conf \ scripts/unity-compositor-fail-ready.conf \ diff --git a/tests/scripts/seatdefaults-still-supported.conf b/tests/scripts/seatdefaults-still-supported.conf index 1af19721..9daef83c 100644 --- a/tests/scripts/seatdefaults-still-supported.conf +++ b/tests/scripts/seatdefaults-still-supported.conf @@ -1,7 +1,10 @@ # -# Check LightDM still supports (now deprecated) config section [SeatDefaults] +# Check LightDM still supports (now deprecated) config section [SeatDefaults] and these options override [Seat:*] # +[Seat:*] +user-session=alternative + [SeatDefaults] autologin-user=have-password1 user-session=default diff --git a/tests/scripts/unity-autologin-legacy.conf b/tests/scripts/unity-autologin-legacy.conf new file mode 100644 index 00000000..c1a13e1f --- /dev/null +++ b/tests/scripts/unity-autologin-legacy.conf @@ -0,0 +1,42 @@ +# +# Check use legacy X command if Xmir not present +# + +[test-xmir] +hide=true + +[Seat:*] +type=unity +autologin-user=have-password1 +user-session=default + +#?*START-DAEMON +#?RUNNER DAEMON-START + +# System compositor starts +#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7 +#?*UNITY-SYSTEM-COMPOSITOR READY + +# X server starts +#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + +# Session starts +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER + +# System compositor switches to session +#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0 + +# Cleanup +#?*STOP-DAEMON +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf index 5df08807..841300ba 100644 --- a/tests/scripts/unity-autologin.conf +++ b/tests/scripts/unity-autologin.conf @@ -15,17 +15,17 @@ user-session=default #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-0 ACCEPT-CONNECT # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c0 -#?XSERVER-0 ACCEPT-CONNECT +#?XMIR-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER # System compositor switches to session @@ -34,6 +34,6 @@ user-session=default # Cleanup #?*STOP-DAEMON #?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf index dfdede5e..204ea24d 100644 --- a/tests/scripts/unity-compositor-command.conf +++ b/tests/scripts/unity-compositor-command.conf @@ -15,17 +15,17 @@ unity-compositor-command=unity-system-compositor --test #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-0 ACCEPT-CONNECT # 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 +#?XMIR-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON #?GREETER-X-0 CONNECTED-TO-DAEMON @@ -36,6 +36,6 @@ unity-compositor-command=unity-system-compositor --test # Cleanup #?*STOP-DAEMON #?GREETER-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/unity-compositor-crash.conf b/tests/scripts/unity-compositor-crash.conf index 8557e731..cd88e1db 100644 --- a/tests/scripts/unity-compositor-crash.conf +++ b/tests/scripts/unity-compositor-crash.conf @@ -13,17 +13,17 @@ type=unity #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-0 ACCEPT-CONNECT # 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 +#?XMIR-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON #?GREETER-X-0 CONNECTED-TO-DAEMON @@ -36,5 +36,5 @@ type=unity # Daemon exits with error code #?GREETER-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=1 diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf index b8c8b1c4..73191d53 100644 --- a/tests/scripts/unity-compositor-next-session.conf +++ b/tests/scripts/unity-compositor-next-session.conf @@ -16,25 +16,25 @@ autologin-in-background=true #?*UNITY-SYSTEM-COMPOSITOR READY # Greeter session -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-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 +#?XMIR-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON #?GREETER-X-0 CONNECTED-TO-DAEMON # Background session -#?XSERVER-1 START SEAT=seat0 MIR-ID=x-1 -#?*XSERVER-1 INDICATE-READY -#?XSERVER-1 INDICATE-READY -#?XSERVER-1 ACCEPT-CONNECT +#?XMIR-1 START SEAT=seat0 MIR-ID=x-1 +#?*XMIR-1 INDICATE-READY +#?XMIR-1 INDICATE-READY +#?XMIR-1 ACCEPT-CONNECT #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2 #?LOGIN1 ACTIVATE-SESSION SESSION=c0 -#?XSERVER-1 ACCEPT-CONNECT +#?XMIR-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER # System compositor switches to greeter @@ -52,8 +52,8 @@ autologin-in-background=true # Cleanup #?*STOP-DAEMON #?GREETER-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 -#?XSERVER-1 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 +#?XMIR-1 TERMINATE SIGNAL=15 #?SESSION-X-1 TERMINATE SIGNAL=15 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf index 00ca640c..025c0a65 100644 --- a/tests/scripts/unity-login.conf +++ b/tests/scripts/unity-login.conf @@ -14,17 +14,17 @@ user-session=default #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-0 ACCEPT-CONNECT # 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 +#?XMIR-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON #?GREETER-X-0 CONNECTED-TO-DAEMON @@ -43,12 +43,12 @@ user-session=default # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c1 -#?XSERVER-0 ACCEPT-CONNECT +#?XMIR-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON #?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf index d96ebbb1..11261429 100644 --- a/tests/scripts/unity-mir-greeter-x-session.conf +++ b/tests/scripts/unity-mir-greeter-x-session.conf @@ -28,17 +28,17 @@ user-session=default #?*GREETER-MIR-greeter-0 START-SESSION # X server starts -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-0 ACCEPT-CONNECT # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c1 -#?XSERVER-0 ACCEPT-CONNECT +#?XMIR-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER # System compositor switches to session @@ -50,6 +50,6 @@ user-session=default # Cleanup #?*STOP-DAEMON #?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf index 046aa578..229f0a65 100644 --- a/tests/scripts/unity-mir-session-x-greeter.conf +++ b/tests/scripts/unity-mir-session-x-greeter.conf @@ -14,17 +14,17 @@ user-session=mir #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-0 ACCEPT-CONNECT # 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 +#?XMIR-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON #?GREETER-X-0 CONNECTED-TO-DAEMON @@ -46,7 +46,7 @@ user-session=mir # Greeter quits once session ready #?GREETER-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 # Cleanup #?*STOP-DAEMON diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf index 66f3b637..c927839a 100644 --- a/tests/scripts/unity-plymouth.conf +++ b/tests/scripts/unity-plymouth.conf @@ -25,17 +25,17 @@ active=true #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-0 ACCEPT-CONNECT # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c0 -#?XSERVER-0 ACCEPT-CONNECT +#?XMIR-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER # System compositor switches to session @@ -44,6 +44,6 @@ active=true # Cleanup #?*STOP-DAEMON #?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/unity-script-hooks.conf b/tests/scripts/unity-script-hooks.conf index bad4a70e..65ec8718 100644 --- a/tests/scripts/unity-script-hooks.conf +++ b/tests/scripts/unity-script-hooks.conf @@ -20,12 +20,12 @@ user-session=default #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-0 ACCEPT-CONNECT #?SCRIPT-HOOK DISPLAY-SETUP #?SCRIPT-HOOK SESSION-SETUP USER=have-password1 @@ -33,7 +33,7 @@ user-session=default # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c0 -#?XSERVER-0 ACCEPT-CONNECT +#?XMIR-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER # System compositor switches to session @@ -46,18 +46,18 @@ user-session=default #?SCRIPT-HOOK SESSION-CLEANUP USER=have-password1 # X server stops -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 # Script hooks run #?SCRIPT-HOOK DISPLAY-STOPPED # X server starts -#?XSERVER-1 START SEAT=seat0 MIR-ID=x-1 +#?XMIR-1 START SEAT=seat0 MIR-ID=x-1 # Daemon connects when X server is ready -#?*XSERVER-1 INDICATE-READY -#?XSERVER-1 INDICATE-READY -#?XSERVER-1 ACCEPT-CONNECT +#?*XMIR-1 INDICATE-READY +#?XMIR-1 INDICATE-READY +#?XMIR-1 ACCEPT-CONNECT # Script hooks run #?SCRIPT-HOOK DISPLAY-SETUP @@ -66,7 +66,7 @@ user-session=default # 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 +#?XMIR-1 ACCEPT-CONNECT #?GREETER-X-1 CONNECT-XSERVER #?GREETER-X-1 CONNECT-TO-DAEMON #?GREETER-X-1 CONNECTED-TO-DAEMON @@ -77,7 +77,7 @@ user-session=default # Cleanup #?*STOP-DAEMON #?GREETER-X-1 TERMINATE SIGNAL=15 -#?XSERVER-1 TERMINATE SIGNAL=15 +#?XMIR-1 TERMINATE SIGNAL=15 # Script hooks run #?SCRIPT-HOOK DISPLAY-STOPPED diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf index d63416ea..51cf79d1 100644 --- a/tests/scripts/unity-switch.conf +++ b/tests/scripts/unity-switch.conf @@ -15,17 +15,17 @@ user-session=default #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-0 ACCEPT-CONNECT # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c0 -#?XSERVER-0 ACCEPT-CONNECT +#?XMIR-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER # System compositor switches to session @@ -36,12 +36,12 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START SEAT=seat0 MIR-ID=x-1 +#?XMIR-1 START SEAT=seat0 MIR-ID=x-1 # Daemon connects when X server is ready -#?*XSERVER-1 INDICATE-READY -#?XSERVER-1 INDICATE-READY -#?XSERVER-1 ACCEPT-CONNECT +#?*XMIR-1 INDICATE-READY +#?XMIR-1 INDICATE-READY +#?XMIR-1 ACCEPT-CONNECT # Lock session #?LOGIN1 LOCK-SESSION SESSION=c0 @@ -49,7 +49,7 @@ user-session=default # 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 +#?XMIR-1 ACCEPT-CONNECT #?GREETER-X-1 CONNECT-XSERVER #?GREETER-X-1 CONNECT-TO-DAEMON #?GREETER-X-1 CONNECTED-TO-DAEMON @@ -66,23 +66,23 @@ user-session=default # New session starts #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c2 -#?XSERVER-1 ACCEPT-CONNECT +#?XMIR-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER # Logout of new session #?*SESSION-X-1 LOGOUT -#?XSERVER-1 TERMINATE SIGNAL=15 +#?XMIR-1 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-2 START SEAT=seat0 MIR-ID=x-2 -#?*XSERVER-2 INDICATE-READY -#?XSERVER-2 INDICATE-READY -#?XSERVER-2 ACCEPT-CONNECT +#?XMIR-2 START SEAT=seat0 MIR-ID=x-2 +#?*XMIR-2 INDICATE-READY +#?XMIR-2 INDICATE-READY +#?XMIR-2 ACCEPT-CONNECT # 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 +#?XMIR-2 ACCEPT-CONNECT #?GREETER-X-2 CONNECT-XSERVER #?GREETER-X-2 CONNECT-TO-DAEMON #?GREETER-X-2 CONNECTED-TO-DAEMON @@ -93,8 +93,8 @@ user-session=default # Cleanup #?*STOP-DAEMON #?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 #?GREETER-X-2 TERMINATE SIGNAL=15 -#?XSERVER-2 TERMINATE SIGNAL=15 +#?XMIR-2 TERMINATE SIGNAL=15 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/vnc-command.conf b/tests/scripts/vnc-command.conf index 3a974b10..fc2bbcb6 100644 --- a/tests/scripts/vnc-command.conf +++ b/tests/scripts/vnc-command.conf @@ -19,22 +19,22 @@ command=Xvnc -option #?VNC-CLIENT CONNECT # Xvnc server starts -#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=TRUE +#?XVNC-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=TRUE # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XVNC-0 INDICATE-READY +#?XVNC-0 INDICATE-READY +#?XVNC-0 ACCEPT-CONNECT # Negotiate with Xvnc -#?*XSERVER-0 START-VNC +#?*XVNC-0 START-VNC #?VNC-CLIENT CONNECTED VERSION="RFB 003.007" -#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" +#?XVNC-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" # 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 +#?XVNC-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON #?GREETER-X-0 CONNECTED-TO-DAEMON @@ -42,5 +42,5 @@ command=Xvnc -option # Clean up #?*STOP-DAEMON #?GREETER-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XVNC-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/vnc-dimensions.conf b/tests/scripts/vnc-dimensions.conf index 8acfff16..0e835138 100644 --- a/tests/scripts/vnc-dimensions.conf +++ b/tests/scripts/vnc-dimensions.conf @@ -21,22 +21,22 @@ depth=16 #?VNC-CLIENT CONNECT # Xvnc server starts -#?XSERVER-0 START GEOMETRY=1440x900 DEPTH=16 OPTION=FALSE +#?XVNC-0 START GEOMETRY=1440x900 DEPTH=16 OPTION=FALSE # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XVNC-0 INDICATE-READY +#?XVNC-0 INDICATE-READY +#?XVNC-0 ACCEPT-CONNECT # Negotiate with Xvnc -#?*XSERVER-0 START-VNC +#?*XVNC-0 START-VNC #?VNC-CLIENT CONNECTED VERSION="RFB 003.007" -#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" +#?XVNC-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" # 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 +#?XVNC-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON #?GREETER-X-0 CONNECTED-TO-DAEMON @@ -44,5 +44,5 @@ depth=16 # Clean up #?*STOP-DAEMON #?GREETER-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XVNC-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/vnc-guest.conf b/tests/scripts/vnc-guest.conf index 10549d93..2d394f12 100644 --- a/tests/scripts/vnc-guest.conf +++ b/tests/scripts/vnc-guest.conf @@ -21,24 +21,24 @@ user-session=default #?VNC-CLIENT CONNECT # Xvnc server starts -#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE +#?XVNC-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XVNC-0 INDICATE-READY +#?XVNC-0 INDICATE-READY +#?XVNC-0 ACCEPT-CONNECT # Negotiate with Xvnc -#?*XSERVER-0 START-VNC +#?*XVNC-0 START-VNC #?VNC-CLIENT CONNECTED VERSION="RFB 003.007" # VNC client connects to X server -#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" +#?XVNC-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" # 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 +#?XVNC-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON #?GREETER-X-0 CONNECTED-TO-DAEMON @@ -55,12 +55,12 @@ user-session=default # Guest session starts #?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.* #?LOGIN1 ACTIVATE-SESSION SESSION=c1 -#?XSERVER-0 ACCEPT-CONNECT +#?XVNC-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER # Clean up #?*STOP-DAEMON #?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XVNC-0 TERMINATE SIGNAL=15 #?GUEST-ACCOUNT REMOVE USERNAME=guest-.* #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf index 63d951eb..2ba177dc 100644 --- a/tests/scripts/vnc-login.conf +++ b/tests/scripts/vnc-login.conf @@ -21,24 +21,24 @@ user-session=default #?VNC-CLIENT CONNECT # Xvnc server starts -#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE +#?XVNC-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XVNC-0 INDICATE-READY +#?XVNC-0 INDICATE-READY +#?XVNC-0 ACCEPT-CONNECT # Negotiate with Xvnc -#?*XSERVER-0 START-VNC +#?*XVNC-0 START-VNC #?VNC-CLIENT CONNECTED VERSION="RFB 003.007" # VNC client connects to X server -#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" +#?XVNC-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" # 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 +#?XVNC-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON #?GREETER-X-0 CONNECTED-TO-DAEMON @@ -54,11 +54,11 @@ user-session=default # Session starts #?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c1 -#?XSERVER-0 ACCEPT-CONNECT +#?XVNC-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER # Clean up #?*STOP-DAEMON #?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XVNC-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf index 454e449b..323fa39f 100644 --- a/tests/scripts/vnc-open-file-descriptors.conf +++ b/tests/scripts/vnc-open-file-descriptors.conf @@ -21,23 +21,23 @@ user-session=default #?VNC-CLIENT CONNECT # Xvnc server starts -#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE +#?XVNC-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XVNC-0 INDICATE-READY +#?XVNC-0 INDICATE-READY +#?XVNC-0 ACCEPT-CONNECT # Negotiate with Xvnc -#?*XSERVER-0 START-VNC +#?*XVNC-0 START-VNC #?VNC-CLIENT CONNECTED VERSION="RFB 003.007" -#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" +#?XVNC-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" # 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 +#?XVNC-0 ACCEPT-CONNECT #?GREETER-X-0 CONNECT-XSERVER #?GREETER-X-0 CONNECT-TO-DAEMON #?GREETER-X-0 CONNECTED-TO-DAEMON @@ -53,7 +53,7 @@ user-session=default # Session starts #?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c1 -#?XSERVER-0 ACCEPT-CONNECT +#?XVNC-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER # Check file descriptors @@ -63,5 +63,5 @@ user-session=default # Clean up #?*STOP-DAEMON #?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XVNC-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am index 0afdeadb..d769f027 100644 --- a/tests/src/Makefile.am +++ b/tests/src/Makefile.am @@ -11,6 +11,7 @@ noinst_PROGRAMS = dbus-env \ unity-system-compositor \ vnc-client \ X \ + Xmir \ Xvnc dist_noinst_SCRIPTS = lightdm-session \ test-python-greeter @@ -75,6 +76,19 @@ X_LDADD = \ $(GIO_LIBS) \ $(GIO_UNIX_LIBS) +Xmir_SOURCES = Xmir.c x-authority.c x-authority.h x-common.c x-common.h x-server.c x-server.h status.c status.h +Xmir_CFLAGS = \ + $(WARN_CFLAGS) \ + $(GOBJECT_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ + $(GIO_UNIX_CFLAGS) +Xmir_LDADD = \ + $(GOBJECT_LIBS) \ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(GIO_UNIX_LIBS) + Xvnc_SOURCES = Xvnc.c x-authority.c x-authority.h x-common.c x-common.h x-server.c x-server.h status.c status.h Xvnc_CFLAGS = \ $(WARN_CFLAGS) \ diff --git a/tests/src/Xmir.c b/tests/src/Xmir.c new file mode 100644 index 00000000..8220a51e --- /dev/null +++ b/tests/src/Xmir.c @@ -0,0 +1,311 @@ +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <sys/types.h> +#include <unistd.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <errno.h> +#include <glib-unix.h> + +#include "status.h" +#include "x-server.h" +#include "x-authority.h" +#include "xdmcp-client.h" + +static GMainLoop *loop; +static int exit_status = EXIT_SUCCESS; + +static GKeyFile *config; + +/* Path to lock file */ +static gchar *lock_path = NULL; + +/* Path to authority database to use */ +static gchar *auth_path = NULL; + +/* ID to use for test reporting */ +static gchar *id; + +/* Display number being served */ +static int display_number = 0; + +/* VT being run on */ +static int vt_number = -1; + +/* X server */ +static XServer *xserver = NULL; + +static void +cleanup (void) +{ + if (lock_path) + unlink (lock_path); + if (xserver) + g_object_unref (xserver); +} + +static void +quit (int status) +{ + exit_status = status; + g_main_loop_quit (loop); +} + +static gboolean +sighup_cb (gpointer user_data) +{ + status_notify ("%s DISCONNECT-CLIENTS", id); + return TRUE; +} + +static gboolean +sigint_cb (gpointer user_data) +{ + status_notify ("%s TERMINATE SIGNAL=%d", id, SIGINT); + quit (EXIT_SUCCESS); + return TRUE; +} + +static gboolean +sigterm_cb (gpointer user_data) +{ + status_notify ("%s TERMINATE SIGNAL=%d", id, SIGTERM); + quit (EXIT_SUCCESS); + return TRUE; +} + +static void +client_connected_cb (XServer *server, XClient *client) +{ + status_notify ("%s ACCEPT-CONNECT", id); + x_client_send_success (client); +} + +static void +client_disconnected_cb (XServer *server, XClient *client) +{ + g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL); +} + +static void +request_cb (const gchar *name, GHashTable *params) +{ + if (!name) + { + g_main_loop_quit (loop); + return; + } + + if (strcmp (name, "INDICATE-READY") == 0) + { + void *handler; + + handler = signal (SIGUSR1, SIG_IGN); + if (handler == SIG_IGN) + { + status_notify ("%s INDICATE-READY", id); + kill (getppid (), SIGUSR1); + } + signal (SIGUSR1, handler); + } +} + +int +main (int argc, char **argv) +{ + int i; + char *pid_string; + gchar *seat = NULL; + gchar *mir_id = NULL; + gchar *lock_filename; + gboolean sharevts = FALSE; + int lock_file; + GString *status_text; + +#if !defined(GLIB_VERSION_2_36) + g_type_init (); +#endif + + loop = g_main_loop_new (NULL, FALSE); + + g_unix_signal_add (SIGINT, sigint_cb, NULL); + g_unix_signal_add (SIGTERM, sigterm_cb, NULL); + g_unix_signal_add (SIGHUP, sighup_cb, NULL); + + for (i = 1; i < argc; i++) + { + char *arg = argv[i]; + + if (arg[0] == ':') + { + display_number = atoi (arg + 1); + } + else if (strcmp (arg, "-auth") == 0) + { + auth_path = argv[i+1]; + i++; + } + else if (strcmp (arg, "-nolisten") == 0) + { + char *protocol = argv[i+1]; + i++; + if (strcmp (protocol, "tcp") == 0) + ;//listen_tcp = FALSE; + else if (strcmp (protocol, "unix") == 0) + ;//listen_unix = FALSE; + } + else if (strcmp (arg, "-nr") == 0) + { + } + else if (strcmp (arg, "-background") == 0) + { + /* Ignore arg */ + i++; + } + else if (g_str_has_prefix (arg, "vt")) + { + vt_number = atoi (arg + 2); + } + else if (strcmp (arg, "-novtswitch") == 0) + { + /* Ignore VT args */ + } + else if (strcmp (arg, "-seat") == 0) + { + seat = argv[i+1]; + i++; + } + else if (strcmp (arg, "-sharevts") == 0) + { + sharevts = TRUE; + } + else if (strcmp (arg, "-mir") == 0) + { + mir_id = argv[i+1]; + i++; + } + else if (strcmp (arg, "-mirSocket") == 0) + { + /* FIXME */ + i++; + } + else + { + g_printerr ("Unrecognized option: %s\n" + "Use: %s [:<display>] [option]\n" + "-auth file Select authorization file\n" + "-nolisten protocol Don't listen on protocol\n" + "-background [none] Create root window with no background\n" + "-nr (Ubuntu-specific) Synonym for -background none\n" + "-seat string seat to run on\n" + "-sharevts share VTs with another X server\n" + "-mir id Mir ID to use\n" + "-mirSocket name Mir socket to use\n" + "vtxx Use virtual terminal xx instead of the next available\n", + arg, argv[0]); + return EXIT_FAILURE; + } + } + + id = g_strdup_printf ("XMIR-%d", display_number); + + status_connect (request_cb, id); + + xserver = x_server_new (display_number); + g_signal_connect (xserver, X_SERVER_SIGNAL_CLIENT_CONNECTED, G_CALLBACK (client_connected_cb), NULL); + g_signal_connect (xserver, X_SERVER_SIGNAL_CLIENT_DISCONNECTED, G_CALLBACK (client_disconnected_cb), NULL); + + status_text = g_string_new (""); + g_string_printf (status_text, "%s START", id); + if (vt_number >= 0) + g_string_append_printf (status_text, " VT=%d", vt_number); + if (seat != NULL) + g_string_append_printf (status_text, " SEAT=%s", seat); + if (sharevts) + g_string_append (status_text, " SHAREVTS=TRUE"); + if (mir_id != NULL) + g_string_append_printf (status_text, " MIR-ID=%s", mir_id); + status_notify ("%s", status_text->str); + g_string_free (status_text, TRUE); + + config = g_key_file_new (); + g_key_file_load_from_file (config, g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), G_KEY_FILE_NONE, NULL); + + if (g_key_file_has_key (config, "test-xserver-config", "return-value", NULL)) + { + int return_value = g_key_file_get_integer (config, "test-xserver-config", "return-value", NULL); + status_notify ("%s EXIT CODE=%d", id, return_value); + return return_value; + } + + lock_filename = g_strdup_printf (".X%d-lock", display_number); + lock_path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", lock_filename, NULL); + g_free (lock_filename); + lock_file = open (lock_path, O_CREAT | O_EXCL | O_WRONLY, 0444); + if (lock_file < 0) + { + char *lock_contents = NULL; + + if (g_file_get_contents (lock_path, &lock_contents, NULL, NULL)) + { + gchar *proc_filename; + pid_t pid; + + pid = atol (lock_contents); + g_free (lock_contents); + + proc_filename = g_strdup_printf ("/proc/%d", pid); + if (!g_file_test (proc_filename, G_FILE_TEST_EXISTS)) + { + gchar *socket_dir; + gchar *socket_filename; + gchar *socket_path; + + socket_dir = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", ".X11-unix", NULL); + g_mkdir_with_parents (socket_dir, 0755); + + socket_filename = g_strdup_printf ("X%d", display_number); + socket_path = g_build_filename (socket_dir, socket_filename, NULL); + + g_printerr ("Breaking lock on non-existant process %d\n", pid); + unlink (lock_path); + unlink (socket_path); + + g_free (socket_dir); + g_free (socket_filename); + g_free (socket_path); + } + g_free (proc_filename); + + lock_file = open (lock_path, O_CREAT | O_EXCL | O_WRONLY, 0444); + } + } + if (lock_file < 0) + { + fprintf (stderr, + "Fatal server error:\n" + "Server is already active for display %d\n" + " If this server is no longer running, remove %s\n" + " and start again.\n", display_number, lock_path); + g_free (lock_path); + lock_path = NULL; + return EXIT_FAILURE; + } + pid_string = g_strdup_printf ("%10ld", (long) getpid ()); + if (write (lock_file, pid_string, strlen (pid_string)) < 0) + { + g_warning ("Error writing PID file: %s", strerror (errno)); + return EXIT_FAILURE; + } + g_free (pid_string); + + if (!x_server_start (xserver)) + return EXIT_FAILURE; + + g_main_loop_run (loop); + + cleanup (); + + return exit_status; +} diff --git a/tests/src/Xvnc.c b/tests/src/Xvnc.c index 971ddcef..56dada4f 100644 --- a/tests/src/Xvnc.c +++ b/tests/src/Xvnc.c @@ -3,6 +3,7 @@ #include <string.h> #include <sys/types.h> #include <unistd.h> +#include <sys/stat.h> #include <fcntl.h> #include <errno.h> #include <gio/gio.h> @@ -13,6 +14,7 @@ #include "x-authority.h" static GMainLoop *loop; +static int exit_status = EXIT_SUCCESS; static GKeyFile *config; @@ -43,8 +45,8 @@ cleanup (void) static void quit (int status) { - cleanup (); - exit (status); + exit_status = status; + g_main_loop_quit (loop); } static gboolean @@ -73,15 +75,8 @@ sigterm_cb (gpointer user_data) static void client_connected_cb (XServer *server, XClient *client) { - gchar *auth_error = NULL; - status_notify ("%s ACCEPT-CONNECT", id); - - if (auth_error) - x_client_send_failed (client, auth_error); - else - x_client_send_success (client); - g_free (auth_error); + x_client_send_success (client); } static void @@ -146,6 +141,7 @@ request_cb (const gchar *name, GHashTable *params) int main (int argc, char **argv) { + int i; char *pid_string; gboolean use_inetd = FALSE; gboolean has_option = FALSE; @@ -153,7 +149,6 @@ main (int argc, char **argv) gint depth = 8; gchar *lock_filename; int lock_file; - int i; #if !defined(GLIB_VERSION_2_36) g_type_init (); @@ -220,7 +215,7 @@ main (int argc, char **argv) } } - id = g_strdup_printf ("XSERVER-%d", display_number); + id = g_strdup_printf ("XVNC-%d", display_number); status_connect (request_cb, id); @@ -250,6 +245,44 @@ main (int argc, char **argv) lock_file = open (lock_path, O_CREAT | O_EXCL | O_WRONLY, 0444); if (lock_file < 0) { + char *lock_contents = NULL; + + if (g_file_get_contents (lock_path, &lock_contents, NULL, NULL)) + { + gchar *proc_filename; + pid_t pid; + + pid = atol (lock_contents); + g_free (lock_contents); + + proc_filename = g_strdup_printf ("/proc/%d", pid); + if (!g_file_test (proc_filename, G_FILE_TEST_EXISTS)) + { + gchar *socket_dir; + gchar *socket_filename; + gchar *socket_path; + + socket_dir = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", ".X11-unix", NULL); + g_mkdir_with_parents (socket_dir, 0755); + + socket_filename = g_strdup_printf ("X%d", display_number); + socket_path = g_build_filename (socket_dir, socket_filename, NULL); + + g_printerr ("Breaking lock on non-existant process %d\n", pid); + unlink (lock_path); + unlink (socket_path); + + g_free (socket_dir); + g_free (socket_filename); + g_free (socket_path); + } + g_free (proc_filename); + + lock_file = open (lock_path, O_CREAT | O_EXCL | O_WRONLY, 0444); + } + } + if (lock_file < 0) + { fprintf (stderr, "Fatal server error:\n" "Server is already active for display %d\n" @@ -257,22 +290,22 @@ main (int argc, char **argv) " and start again.\n", display_number, lock_path); g_free (lock_path); lock_path = NULL; - quit (EXIT_FAILURE); + return EXIT_FAILURE; } pid_string = g_strdup_printf ("%10ld", (long) getpid ()); if (write (lock_file, pid_string, strlen (pid_string)) < 0) { g_warning ("Error writing PID file: %s", strerror (errno)); - quit (EXIT_FAILURE); + return EXIT_FAILURE; } g_free (pid_string); if (!x_server_start (xserver)) - quit (EXIT_FAILURE); + return EXIT_FAILURE; g_main_loop_run (loop); cleanup (); - return EXIT_SUCCESS; + return exit_status; } diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c index 97791d16..1d6fffd3 100644 --- a/tests/src/libsystem.c +++ b/tests/src/libsystem.c @@ -178,6 +178,14 @@ setresuid (uid_t ruid, uid_t uuid, uid_t suid) static gchar * redirect_path (const gchar *path) { + /* Hide Xmir for legacy tests */ + if (g_str_has_suffix (path, "/Xmir")) + { + connect_status (); + if (g_key_file_get_boolean (config, "test-xmir", "hide", NULL)) + return NULL; + } + // Don't redirect if inside the running directory if (g_str_has_prefix (path, g_getenv ("LIGHTDM_TEST_ROOT"))) return g_strdup (path); @@ -1928,3 +1936,4 @@ xcb_disconnect (xcb_connection_t *c) g_object_unref (c->socket); free (c); } + diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index fad4b746..8497f66b 100644 --- a/tests/src/test-runner.c +++ b/tests/src/test-runner.c @@ -966,6 +966,8 @@ handle_command (const gchar *command) else if (g_str_has_prefix (name, "SESSION-") || g_str_has_prefix (name, "GREETER-") || g_str_has_prefix (name, "XSERVER-") || + g_str_has_prefix (name, "XMIR-") || + g_str_has_prefix (name, "XVNC-") || strcmp (name, "UNITY-SYSTEM-COMPOSITOR") == 0) { GList *link; diff --git a/tests/test-unity-autologin-legacy b/tests/test-unity-autologin-legacy new file mode 100755 index 00000000..1282544b --- /dev/null +++ b/tests/test-unity-autologin-legacy @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner unity-autologin-legacy test-gobject-greeter |