diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-06-26 14:36:43 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2013-06-26 14:36:43 +1200 |
| commit | 1666050c96987b674a66a9ea4bdfc704532879c5 (patch) | |
| tree | 3d91f90466bf4c3585fafadfd6ead18b069b60d0 | |
| parent | 66321294e7dfd5907b757dfdd41e9c91afa4f72c (diff) | |
| parent | 24be578f0b29a85ec522511baf8829c8e741e7a7 (diff) | |
| download | lightdm-git-1666050c96987b674a66a9ea4bdfc704532879c5.tar.gz | |
Merge with trunk
210 files changed, 404 insertions, 346 deletions
@@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" diff --git a/po/ca@valencia.po b/po/ca@valencia.po index 6cf03eed..85c27988 100644 --- a/po/ca@valencia.po +++ b/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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" diff --git a/po/en_AU.po b/po/en_AU.po index 02e46e20..cb25e41c 100644 --- a/po/en_AU.po +++ b/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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" diff --git a/po/en_CA.po b/po/en_CA.po index d0ee16e8..cc433432 100644 --- a/po/en_CA.po +++ b/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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" diff --git a/po/en_GB.po b/po/en_GB.po index 347e8002..7ec0655c 100644 --- a/po/en_GB.po +++ b/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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0675ba6d..9d1c4685 100644 --- a/po/pt_BR.po +++ b/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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" "Language: sr\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" @@ -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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" diff --git a/po/zh_CN.po b/po/zh_CN.po index 0a6ea8c8..67d66d39 100644 --- a/po/zh_CN.po +++ b/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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" diff --git a/po/zh_HK.po b/po/zh_HK.po index 231451ea..795879cb 100644 --- a/po/zh_HK.po +++ b/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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" diff --git a/po/zh_TW.po b/po/zh_TW.po index 39d9dbe4..880b093b 100644 --- a/po/zh_TW.po +++ b/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: 2013-06-14 06:00+0000\n" -"X-Generator: Launchpad (build 16667)\n" +"X-Launchpad-Export-Date: 2013-06-24 04:49+0000\n" +"X-Generator: Launchpad (build 16677)\n" #: ../greeters/gtk/lightdm-gtk-greeter.c:409 msgid "Are you sure you want to close all programs and restart the computer?" diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c index 52d5e60a..d1c240c4 100644 --- a/src/seat-xlocal.c +++ b/src/seat-xlocal.c @@ -109,14 +109,20 @@ seat_xlocal_create_session (Seat *seat, Display *display) { XServerLocal *xserver; XSession *session; - gchar *tty; + gchar *t; xserver = XSERVER_LOCAL (display_get_display_server (display)); session = xsession_new (XSERVER (xserver)); - tty = g_strdup_printf ("/dev/tty%d", xserver_local_get_vt (xserver)); - session_set_tty (SESSION (session), tty); - g_free (tty); + t = g_strdup_printf ("/dev/tty%d", xserver_local_get_vt (xserver)); + session_set_tty (SESSION (session), t); + g_free (t); + + /* Set variables for logind */ + session_set_env (SESSION (session), "XDG_SEAT", "seat0"); + t = g_strdup_printf ("%d", xserver_local_get_vt (xserver)); + session_set_env (SESSION (session), "XDG_VTNR", t); + g_free (t); return SESSION (session); } diff --git a/src/seat-xvnc.c b/src/seat-xvnc.c index 0053bb3f..c063a3c6 100644 --- a/src/seat-xvnc.c +++ b/src/seat-xvnc.c @@ -72,6 +72,7 @@ seat_xvnc_create_session (Seat *seat, Display *display) XSession *session; GInetSocketAddress *address; gchar *hostname; + gchar *t; xserver = XSERVER_XVNC (display_get_display_server (display)); diff --git a/tests/Makefile.am b/tests/Makefile.am index 5156df57..b76f9c1e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -139,6 +139,7 @@ TESTS = \ test-no-accounts-service \ test-console-kit \ test-no-console-kit \ + test-login1 \ test-no-login1 \ test-no-console-kit-or-login1 \ test-gobject-power \ @@ -288,6 +289,7 @@ EXTRA_DIST = \ scripts/lock-session.conf \ scripts/lock-session-no-password.conf \ scripts/lock-session-return-session.conf \ + scripts/login1.conf \ scripts/login.conf \ scripts/login-crash-authenticate.conf \ scripts/login-guest.conf \ diff --git a/tests/scripts/additional-config.conf b/tests/scripts/additional-config.conf index fa49a999..204ab890 100644 --- a/tests/scripts/additional-config.conf +++ b/tests/scripts/additional-config.conf @@ -11,7 +11,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf index f23b3f5f..c9573c9b 100644 --- a/tests/scripts/autologin-guest-fail-setup-script.conf +++ b/tests/scripts/autologin-guest-fail-setup-script.conf @@ -11,7 +11,7 @@ autologin-guest=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf index eee1d346..7dcea539 100644 --- a/tests/scripts/autologin-guest-in-background.conf +++ b/tests/scripts/autologin-guest-in-background.conf @@ -13,7 +13,7 @@ user-session=default #?RUNNER DAEMON-START # Greeter starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START @@ -23,7 +23,7 @@ user-session=default #?GREETER-X-0 CONNECTED-TO-DAEMON # Guest session starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT #?GUEST-ACCOUNT ADD USERNAME=guest-.* diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf index afa34736..aefb7fd4 100644 --- a/tests/scripts/autologin-guest-logout.conf +++ b/tests/scripts/autologin-guest-logout.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -36,7 +36,7 @@ user-session=default #?GUEST-ACCOUNT REMOVE USERNAME=guest-.* # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf index c1dbd89b..7342c5a2 100644 --- a/tests/scripts/autologin-guest-timeout.conf +++ b/tests/scripts/autologin-guest-timeout.conf @@ -13,7 +13,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf index 55880a9e..e7a1723b 100644 --- a/tests/scripts/autologin-guest.conf +++ b/tests/scripts/autologin-guest.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf index d8aba36a..74f8b994 100644 --- a/tests/scripts/autologin-in-background.conf +++ b/tests/scripts/autologin-in-background.conf @@ -10,7 +10,7 @@ user-session=default #?RUNNER DAEMON-START # Greeter starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START @@ -20,7 +20,7 @@ user-session=default #?GREETER-X-0 CONNECTED-TO-DAEMON # Autologin session starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 START USER=have-password1 diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf index 62fe206d..8e881a8b 100644 --- a/tests/scripts/autologin-invalid-session.conf +++ b/tests/scripts/autologin-invalid-session.conf @@ -9,7 +9,7 @@ user-session=invalid #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf index 25a8329d..7ce9cc20 100644 --- a/tests/scripts/autologin-invalid-user.conf +++ b/tests/scripts/autologin-invalid-user.conf @@ -8,7 +8,7 @@ autologin-user=invalid #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf index 50e7dd7f..9588c9dc 100644 --- a/tests/scripts/autologin-logout.conf +++ b/tests/scripts/autologin-logout.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -27,7 +27,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf index 4407f49b..1f66bfc8 100644 --- a/tests/scripts/autologin-new-authtok.conf +++ b/tests/scripts/autologin-new-authtok.conf @@ -8,7 +8,7 @@ autologin-user=new-authtok #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf index 8f1c3f45..e742456f 100644 --- a/tests/scripts/autologin-password.conf +++ b/tests/scripts/autologin-password.conf @@ -8,7 +8,7 @@ autologin-user=always-password #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf index 3cad3cf5..aba2eb04 100644 --- a/tests/scripts/autologin-previous-session.conf +++ b/tests/scripts/autologin-previous-session.conf @@ -8,7 +8,7 @@ autologin-user=have-session #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf index 1a2b9235..242dc7c2 100644 --- a/tests/scripts/autologin-session-crash.conf +++ b/tests/scripts/autologin-session-crash.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -27,7 +27,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf index faeeb5bc..c0e2a26f 100644 --- a/tests/scripts/autologin-session-error.conf +++ b/tests/scripts/autologin-session-error.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -21,7 +21,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf index 61c9e1bb..9e3d8b6d 100644 --- a/tests/scripts/autologin-timeout-in-background.conf +++ b/tests/scripts/autologin-timeout-in-background.conf @@ -11,7 +11,7 @@ user-session=default #?RUNNER DAEMON-START # Greeter starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START @@ -21,7 +21,7 @@ user-session=default #?GREETER-X-0 CONNECTED-TO-DAEMON # Autologin session starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT #?SESSION-X-1 START USER=have-password1 diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf index c6df7f5e..31f7f608 100644 --- a/tests/scripts/autologin-timeout.conf +++ b/tests/scripts/autologin-timeout.conf @@ -10,7 +10,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf index 9ed310c3..36ca845a 100644 --- a/tests/scripts/autologin-xserver-crash.conf +++ b/tests/scripts/autologin-xserver-crash.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # XServer starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -27,7 +27,7 @@ user-session=default #?SESSION-X-0 TERMINATE SIGNAL=15 # X server restarts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf index 3d0cd0bf..6484f70d 100644 --- a/tests/scripts/autologin.conf +++ b/tests/scripts/autologin.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/cancel-authentication.conf b/tests/scripts/cancel-authentication.conf index 27213175..94f5e60c 100644 --- a/tests/scripts/cancel-authentication.conf +++ b/tests/scripts/cancel-authentication.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf index f2ec30e5..a7b8fe6f 100644 --- a/tests/scripts/change-authentication.conf +++ b/tests/scripts/change-authentication.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf index 6d211a29..890770d5 100644 --- a/tests/scripts/console-kit.conf +++ b/tests/scripts/console-kit.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf index 84cc3a3d..5d9143d7 100644 --- a/tests/scripts/crash-authenticate.conf +++ b/tests/scripts/crash-authenticate.conf @@ -8,7 +8,7 @@ autologin-user=crash-authenticate #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf index 67ca0d2a..9d44b3e1 100644 --- a/tests/scripts/cred-error.conf +++ b/tests/scripts/cred-error.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -21,7 +21,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf index a4285059..98cb0c3b 100644 --- a/tests/scripts/cred-expired.conf +++ b/tests/scripts/cred-expired.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -21,7 +21,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf index 3860c289..82fcdb4b 100644 --- a/tests/scripts/cred-unavail.conf +++ b/tests/scripts/cred-unavail.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -21,7 +21,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf index 8ba7d6a4..0ead01e0 100644 --- a/tests/scripts/denied.conf +++ b/tests/scripts/denied.conf @@ -8,7 +8,7 @@ autologin-user=denied #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf index b08e5c0e..11eed1d3 100644 --- a/tests/scripts/expired.conf +++ b/tests/scripts/expired.conf @@ -8,7 +8,7 @@ autologin-user=expired #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf index 5e131d7a..aa49ba43 100644 --- a/tests/scripts/greeter-fail-start.conf +++ b/tests/scripts/greeter-fail-start.conf @@ -8,7 +8,7 @@ return-value=1 #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/greeter-not-installed.conf b/tests/scripts/greeter-not-installed.conf index b0590713..a8ad842b 100644 --- a/tests/scripts/greeter-not-installed.conf +++ b/tests/scripts/greeter-not-installed.conf @@ -8,7 +8,7 @@ return-value=1 #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf index 251b1bc6..8930e897 100644 --- a/tests/scripts/greeter-xserver-crash.conf +++ b/tests/scripts/greeter-xserver-crash.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -25,7 +25,7 @@ #?GREETER-X-0 TERMINATE SIGNAL=15 # X server restarts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf index d67b3316..63a82a13 100644 --- a/tests/scripts/group-membership.conf +++ b/tests/scripts/group-membership.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf index d073c3eb..851ec0c2 100644 --- a/tests/scripts/home-dir-on-authenticate.conf +++ b/tests/scripts/home-dir-on-authenticate.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/home-dir-on-session.conf b/tests/scripts/home-dir-on-session.conf index 2695fb3c..c65892ef 100644 --- a/tests/scripts/home-dir-on-session.conf +++ b/tests/scripts/home-dir-on-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/keyboard-layout.conf b/tests/scripts/keyboard-layout.conf index d7e83611..2830b579 100644 --- a/tests/scripts/keyboard-layout.conf +++ b/tests/scripts/keyboard-layout.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/language-no-accounts-service.conf b/tests/scripts/language-no-accounts-service.conf index 195dcdc8..53090872 100644 --- a/tests/scripts/language-no-accounts-service.conf +++ b/tests/scripts/language-no-accounts-service.conf @@ -8,7 +8,7 @@ disable-accounts-service=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf index e5dc220a..bb395695 100644 --- a/tests/scripts/language.conf +++ b/tests/scripts/language.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf index a7a51dfb..e32b3597 100644 --- a/tests/scripts/lock-seat-return-session.conf +++ b/tests/scripts/lock-seat-return-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -25,7 +25,7 @@ user-session=default #?SESSION-X-0 LOCK-SEAT # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf index 9bf8f555..37a15b52 100644 --- a/tests/scripts/lock-seat.conf +++ b/tests/scripts/lock-seat.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -25,7 +25,7 @@ user-session=default #?SESSION-X-0 LOCK-SEAT # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf index a34e0413..84aa7a13 100644 --- a/tests/scripts/lock-session-no-password.conf +++ b/tests/scripts/lock-session-no-password.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -25,7 +25,7 @@ user-session=default #?SESSION-X-0 LOCK-SESSION # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf index 335b1a03..0b9061f9 100644 --- a/tests/scripts/lock-session-return-session.conf +++ b/tests/scripts/lock-session-return-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -25,7 +25,7 @@ user-session=default #?SESSION-X-0 LOCK-SESSION # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf index ca4bcebd..f2969f35 100644 --- a/tests/scripts/lock-session.conf +++ b/tests/scripts/lock-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -25,7 +25,7 @@ user-session=default #?SESSION-X-0 LOCK-SESSION # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-crash-authenticate.conf b/tests/scripts/login-crash-authenticate.conf index f12a11f5..7edf3e23 100644 --- a/tests/scripts/login-crash-authenticate.conf +++ b/tests/scripts/login-crash-authenticate.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf index cb53acff..a278be53 100644 --- a/tests/scripts/login-guest-disabled.conf +++ b/tests/scripts/login-guest-disabled.conf @@ -8,7 +8,7 @@ allow-guest=false #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf index 4d15aed0..5738e265 100644 --- a/tests/scripts/login-guest-fail-setup-script.conf +++ b/tests/scripts/login-guest-fail-setup-script.conf @@ -8,7 +8,7 @@ guest-account-script=false #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -33,7 +33,7 @@ guest-account-script=false #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf index e32fcf26..c69c7b9b 100644 --- a/tests/scripts/login-guest-logout.conf +++ b/tests/scripts/login-guest-logout.conf @@ -11,7 +11,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -48,7 +48,7 @@ user-session=default #?GUEST-ACCOUNT REMOVE USERNAME=guest-.* # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-guest-no-setup-script.conf b/tests/scripts/login-guest-no-setup-script.conf index cdad799b..86324588 100644 --- a/tests/scripts/login-guest-no-setup-script.conf +++ b/tests/scripts/login-guest-no-setup-script.conf @@ -8,7 +8,7 @@ guest-account-script= #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf index 02c8879a..804c3272 100644 --- a/tests/scripts/login-guest.conf +++ b/tests/scripts/login-guest.conf @@ -11,7 +11,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-info-prompt.conf b/tests/scripts/login-info-prompt.conf index d4b0b38d..1a12c036 100644 --- a/tests/scripts/login-info-prompt.conf +++ b/tests/scripts/login-info-prompt.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf index 058ea64d..f08eb2e4 100644 --- a/tests/scripts/login-invalid-session.conf +++ b/tests/scripts/login-invalid-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -30,7 +30,7 @@ #?XSERVER-0 TERMINATE SIGNAL=15 # X server restarts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf index 04ba79be..231b9fd7 100644 --- a/tests/scripts/login-invalid-user.conf +++ b/tests/scripts/login-invalid-user.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf index f2fc8e75..31210264 100644 --- a/tests/scripts/login-logout.conf +++ b/tests/scripts/login-logout.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -41,7 +41,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-long-password.conf b/tests/scripts/login-long-password.conf index 74ac5c95..9a6d6f6a 100644 --- a/tests/scripts/login-long-password.conf +++ b/tests/scripts/login-long-password.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-long-username.conf b/tests/scripts/login-long-username.conf index 85b77271..9da48179 100644 --- a/tests/scripts/login-long-username.conf +++ b/tests/scripts/login-long-username.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf index 9de99876..929ec67f 100644 --- a/tests/scripts/login-manual-previous-session.conf +++ b/tests/scripts/login-manual-previous-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf index 5ea74f21..22a0a4fc 100644 --- a/tests/scripts/login-manual.conf +++ b/tests/scripts/login-manual.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-multi-info-prompt.conf b/tests/scripts/login-multi-info-prompt.conf index 469c4add..f823b6a9 100644 --- a/tests/scripts/login-multi-info-prompt.conf +++ b/tests/scripts/login-multi-info-prompt.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-multi-prompt.conf b/tests/scripts/login-multi-prompt.conf index 6178eeb3..321bbbee 100644 --- a/tests/scripts/login-multi-prompt.conf +++ b/tests/scripts/login-multi-prompt.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf index d05c71f6..c1234d45 100644 --- a/tests/scripts/login-new-authtok.conf +++ b/tests/scripts/login-new-authtok.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf index d2950cce..a309f2ae 100644 --- a/tests/scripts/login-no-password.conf +++ b/tests/scripts/login-no-password.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf index 23cc8ef2..2ba4eab9 100644 --- a/tests/scripts/login-pam.conf +++ b/tests/scripts/login-pam.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf index ae50986a..bc566557 100644 --- a/tests/scripts/login-pick-session.conf +++ b/tests/scripts/login-pick-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf index 7caf0a8c..fc46bd31 100644 --- a/tests/scripts/login-previous-session.conf +++ b/tests/scripts/login-previous-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf index 44f48ceb..12dd9ddb 100644 --- a/tests/scripts/login-remote-session.conf +++ b/tests/scripts/login-remote-session.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf index c7463973..867dc25d 100644 --- a/tests/scripts/login-session-crash.conf +++ b/tests/scripts/login-session-crash.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -41,7 +41,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-two-factor.conf b/tests/scripts/login-two-factor.conf index 762e0bb7..2aae4da6 100644 --- a/tests/scripts/login-two-factor.conf +++ b/tests/scripts/login-two-factor.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf index 27bc938c..6cdd19ee 100644 --- a/tests/scripts/login-wrong-password.conf +++ b/tests/scripts/login-wrong-password.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf index 24d1fc8b..01d779b1 100644 --- a/tests/scripts/login-xserver-crash.conf +++ b/tests/scripts/login-xserver-crash.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # XServer starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -41,7 +41,7 @@ user-session=default #?SESSION-X-0 TERMINATE SIGNAL=15 # X server restarts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf index c08b9e3c..5a09050e 100644 --- a/tests/scripts/login.conf +++ b/tests/scripts/login.conf @@ -8,7 +8,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/login1.conf b/tests/scripts/login1.conf new file mode 100644 index 00000000..f00950dc --- /dev/null +++ b/tests/scripts/login1.conf @@ -0,0 +1,33 @@ +# +# Check logind variables are set in session +# + +[SeatDefaults] +autologin-user=have-password1 +user-session=default + +#?RUNNER DAEMON-START + +# X server starts +#?XSERVER-0 START VT=7 +#?XSERVER-0 INDICATE-READY + +# LightDM connects to X server +#?XSERVER-0 ACCEPT-CONNECT + +# Session starts +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER + +# Check environment variables +#?*SESSION-X-0 READ-ENV NAME=XDG_SEAT +#?SESSION-X-0 READ-ENV NAME=XDG_SEAT VALUE=seat0 +#?*SESSION-X-0 READ-ENV NAME=XDG_VTNR +#?SESSION-X-0 READ-ENV NAME=XDG_VTNR VALUE=7 + +# Cleanup +#?*STOP-DAEMON +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf index eba99e16..b519fdc1 100644 --- a/tests/scripts/no-accounts-service.conf +++ b/tests/scripts/no-accounts-service.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf index 1b431b47..6419a7d8 100644 --- a/tests/scripts/no-config.conf +++ b/tests/scripts/no-config.conf @@ -8,7 +8,7 @@ have-config=false #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/no-console-kit-or-login1.conf b/tests/scripts/no-console-kit-or-login1.conf index 4d427d5a..cd938768 100644 --- a/tests/scripts/no-console-kit-or-login1.conf +++ b/tests/scripts/no-console-kit-or-login1.conf @@ -13,7 +13,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf index 23e9e847..de916d1c 100644 --- a/tests/scripts/no-console-kit.conf +++ b/tests/scripts/no-console-kit.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/no-keyboard-layout.conf b/tests/scripts/no-keyboard-layout.conf index d6a871f8..eeb0f5ca 100644 --- a/tests/scripts/no-keyboard-layout.conf +++ b/tests/scripts/no-keyboard-layout.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/no-language.conf b/tests/scripts/no-language.conf index 492922e7..c619978e 100644 --- a/tests/scripts/no-language.conf +++ b/tests/scripts/no-language.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf index 9924003a..3780bee4 100644 --- a/tests/scripts/no-login1.conf +++ b/tests/scripts/no-login1.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf index 9389a84b..62613088 100644 --- a/tests/scripts/open-file-descriptors.conf +++ b/tests/scripts/open-file-descriptors.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf index ec7ee105..04177326 100644 --- a/tests/scripts/pam.conf +++ b/tests/scripts/pam.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/plymouth-active-vt.conf b/tests/scripts/plymouth-active-vt.conf index 905b3d20..43daef1f 100644 --- a/tests/scripts/plymouth-active-vt.conf +++ b/tests/scripts/plymouth-active-vt.conf @@ -15,7 +15,7 @@ active=true #?PLYMOUTH DEACTIVATE # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # Plymouth quits but keeps image in framebuffer diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf index 017cdcce..d1fd2a6d 100644 --- a/tests/scripts/plymouth-inactive-vt.conf +++ b/tests/scripts/plymouth-inactive-vt.conf @@ -12,7 +12,7 @@ active=true #?PLYMOUTH PING ACTIVE=TRUE #?PLYMOUTH HAS-ACTIVE-VT=FALSE #?PLYMOUTH QUIT RETAIN-SPLASH=FALSE -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf index e08f7074..77e06412 100644 --- a/tests/scripts/power-no-console-kit.conf +++ b/tests/scripts/power-no-console-kit.conf @@ -8,7 +8,7 @@ disable-console-kit=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/power-no-login1.conf b/tests/scripts/power-no-login1.conf index ed996d3c..f5044b18 100644 --- a/tests/scripts/power-no-login1.conf +++ b/tests/scripts/power-no-login1.conf @@ -8,7 +8,7 @@ disable-login1=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/power-no-services.conf b/tests/scripts/power-no-services.conf index 613f2a3e..603ced42 100644 --- a/tests/scripts/power-no-services.conf +++ b/tests/scripts/power-no-services.conf @@ -10,7 +10,7 @@ disable-login1=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/power.conf b/tests/scripts/power.conf index d909884d..d2ea20bb 100644 --- a/tests/scripts/power.conf +++ b/tests/scripts/power.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf index a7b71164..88755780 100644 --- a/tests/scripts/restart-authentication.conf +++ b/tests/scripts/restart-authentication.conf @@ -5,7 +5,7 @@ #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/script-hook-fail-display-setup.conf b/tests/scripts/script-hook-fail-display-setup.conf index 1b3012c9..e9e39124 100644 --- a/tests/scripts/script-hook-fail-display-setup.conf +++ b/tests/scripts/script-hook-fail-display-setup.conf @@ -8,7 +8,7 @@ display-setup-script=test-script-hook DISPLAY-SETUP 1 #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/script-hook-fail-greeter-setup.conf b/tests/scripts/script-hook-fail-greeter-setup.conf index 464875e0..701a41a4 100644 --- a/tests/scripts/script-hook-fail-greeter-setup.conf +++ b/tests/scripts/script-hook-fail-greeter-setup.conf @@ -8,7 +8,7 @@ greeter-setup-script=test-script-hook GREETER-SETUP 1 #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf index 81519cac..7c7f6ea6 100644 --- a/tests/scripts/script-hook-fail-session-setup.conf +++ b/tests/scripts/script-hook-fail-session-setup.conf @@ -9,7 +9,7 @@ autologin-user=have-password1 #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf index 1d20c401..a6e670ba 100644 --- a/tests/scripts/script-hooks.conf +++ b/tests/scripts/script-hooks.conf @@ -13,7 +13,7 @@ user-session=default #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -38,7 +38,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf index 5286ae0b..7f7a12a2 100644 --- a/tests/scripts/session-stderr-backup.conf +++ b/tests/scripts/session-stderr-backup.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -28,7 +28,7 @@ user-session=default # Restart session #?*SESSION-X-0 LOGOUT #?XSERVER-0 TERMINATE SIGNAL=15 -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START @@ -56,7 +56,7 @@ user-session=default # Restart session #?*SESSION-X-0 LOGOUT #?XSERVER-0 TERMINATE SIGNAL=15 -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT #?GREETER-X-0 START diff --git a/tests/scripts/session-stderr-multi-write.conf b/tests/scripts/session-stderr-multi-write.conf index 3b500369..f107c624 100644 --- a/tests/scripts/session-stderr-multi-write.conf +++ b/tests/scripts/session-stderr-multi-write.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf index 27b922aa..57008242 100644 --- a/tests/scripts/session-stderr.conf +++ b/tests/scripts/session-stderr.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf index ddf7a5ec..37074b67 100644 --- a/tests/scripts/session-stdout.conf +++ b/tests/scripts/session-stdout.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/switch-to-greeter-new-session-logout-new.conf b/tests/scripts/switch-to-greeter-new-session-logout-new.conf index bfdb6222..32eb1125 100644 --- a/tests/scripts/switch-to-greeter-new-session-logout-new.conf +++ b/tests/scripts/switch-to-greeter-new-session-logout-new.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT @@ -23,7 +23,7 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server @@ -54,7 +54,7 @@ user-session=default #?XSERVER-1 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY #?XSERVER-1 ACCEPT-CONNECT diff --git a/tests/scripts/switch-to-greeter-new-session-logout-old.conf b/tests/scripts/switch-to-greeter-new-session-logout-old.conf index 2e04e30b..b9059fc7 100644 --- a/tests/scripts/switch-to-greeter-new-session-logout-old.conf +++ b/tests/scripts/switch-to-greeter-new-session-logout-old.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT @@ -23,7 +23,7 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server @@ -58,7 +58,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf index ef3c2204..6f0f5e79 100644 --- a/tests/scripts/switch-to-greeter-new-session.conf +++ b/tests/scripts/switch-to-greeter-new-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -25,7 +25,7 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf index 6fc7867d..91332062 100644 --- a/tests/scripts/switch-to-greeter-return-session-logout.conf +++ b/tests/scripts/switch-to-greeter-return-session-logout.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -25,7 +25,7 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server @@ -54,7 +54,7 @@ user-session=default #?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY #?XSERVER-0 ACCEPT-CONNECT diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf index 50c0ca00..be80d0d2 100644 --- a/tests/scripts/switch-to-greeter-return-session.conf +++ b/tests/scripts/switch-to-greeter-return-session.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -25,7 +25,7 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf index 4ea98315..2c19fe3f 100644 --- a/tests/scripts/switch-to-greeter.conf +++ b/tests/scripts/switch-to-greeter.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -25,7 +25,7 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf index e431d6cf..b2ae94c2 100644 --- a/tests/scripts/switch-to-guest.conf +++ b/tests/scripts/switch-to-guest.conf @@ -13,7 +13,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -29,7 +29,7 @@ user-session=default #?RUNNER SWITCH-TO-GUEST # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/switch-to-user-existing-session.conf b/tests/scripts/switch-to-user-existing-session.conf index d607d0b1..4ad54882 100644 --- a/tests/scripts/switch-to-user-existing-session.conf +++ b/tests/scripts/switch-to-user-existing-session.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/switch-to-user-logout.conf b/tests/scripts/switch-to-user-logout.conf index 2c3a6938..fdf3976f 100644 --- a/tests/scripts/switch-to-user-logout.conf +++ b/tests/scripts/switch-to-user-logout.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -26,7 +26,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=no-password1 # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server @@ -44,7 +44,7 @@ user-session=default #?XSERVER-1 TERMINATE SIGNAL=15 # X server starts for greeter -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf index 93736ad6..d1cde5b8 100644 --- a/tests/scripts/switch-to-user-no-password.conf +++ b/tests/scripts/switch-to-user-no-password.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -26,7 +26,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=no-password1 # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf index 494a557f..f29a43a1 100644 --- a/tests/scripts/switch-to-user.conf +++ b/tests/scripts/switch-to-user.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -26,7 +26,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=have-password1 # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf index 9d311dd9..6a42bc34 100644 --- a/tests/scripts/switch-to-users.conf +++ b/tests/scripts/switch-to-users.conf @@ -10,7 +10,7 @@ user-session=default #?*WAIT # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server @@ -26,7 +26,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=no-password1 # New X server starts -#?XSERVER-1 START +#?XSERVER-1 START VT=8 #?XSERVER-1 INDICATE-READY # LightDM connects to X server @@ -42,7 +42,7 @@ user-session=default #?RUNNER SWITCH-TO-USER USERNAME=no-password2 # New X server starts -#?XSERVER-2 START +#?XSERVER-2 START VT=9 #?XSERVER-2 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf index 33cf80d9..0aa5a672 100644 --- a/tests/scripts/system-xauthority.conf +++ b/tests/scripts/system-xauthority.conf @@ -12,7 +12,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/unity-compositor-fail-ready.conf b/tests/scripts/unity-compositor-fail-ready.conf index 59d8cf72..bad936e0 100644 --- a/tests/scripts/unity-compositor-fail-ready.conf +++ b/tests/scripts/unity-compositor-fail-ready.conf @@ -15,7 +15,7 @@ unity-compositor-timeout=1 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 # X server starts in VT mode -#?XSERVER-0 START +#?XSERVER-0 START VT=8 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/unity-compositor-fail-start.conf b/tests/scripts/unity-compositor-fail-start.conf index bbbbf4fc..258b7f4f 100644 --- a/tests/scripts/unity-compositor-fail-start.conf +++ b/tests/scripts/unity-compositor-fail-start.conf @@ -15,7 +15,7 @@ type=unity #?UNITY-SYSTEM-COMPOSITOR EXIT CODE=1 # X server starts in VT mode -#?XSERVER-0 START +#?XSERVER-0 START VT=8 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf index 1d913106..ff9d0d61 100644 --- a/tests/scripts/user-renamed-invalid.conf +++ b/tests/scripts/user-renamed-invalid.conf @@ -8,7 +8,7 @@ autologin-user=change-user-invalid #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf index dd15be7d..3bddb79b 100644 --- a/tests/scripts/user-renamed.conf +++ b/tests/scripts/user-renamed.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/users.conf b/tests/scripts/users.conf index 70162377..db3ddee7 100644 --- a/tests/scripts/users.conf +++ b/tests/scripts/users.conf @@ -11,7 +11,7 @@ log-user-changes=true #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/util-path.conf b/tests/scripts/util-path.conf index fa1af66a..53fa4d11 100644 --- a/tests/scripts/util-path.conf +++ b/tests/scripts/util-path.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf index e7758579..aa895a55 100644 --- a/tests/scripts/xauthority.conf +++ b/tests/scripts/xauthority.conf @@ -9,7 +9,7 @@ user-session=default #?RUNNER DAEMON-START # X server starts -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 INDICATE-READY # LightDM connects to X server diff --git a/tests/scripts/xserver-fail-start.conf b/tests/scripts/xserver-fail-start.conf index 1ea8ea42..129fdaad 100644 --- a/tests/scripts/xserver-fail-start.conf +++ b/tests/scripts/xserver-fail-start.conf @@ -8,7 +8,7 @@ return-value=1 #?RUNNER DAEMON-START # X server fails to start -#?XSERVER-0 START +#?XSERVER-0 START VT=7 #?XSERVER-0 EXIT CODE=1 # Daemon stops with error diff --git a/tests/src/X.c b/tests/src/X.c index 1240f7b0..66574238 100644 --- a/tests/src/X.c +++ b/tests/src/X.c @@ -27,6 +27,9 @@ static gchar *auth_path = NULL; /* Display number being served */ static int display_number = 0; +/* VT being run on */ +static int vt_number = -1; + /* X server */ static XServer *xserver = NULL; @@ -198,6 +201,7 @@ main (int argc, char **argv) gchar *mir_id = NULL; gchar *lock_filename; int lock_file; + GString *status_text; signal (SIGINT, signal_cb); signal (SIGTERM, signal_cb); @@ -258,7 +262,7 @@ main (int argc, char **argv) } else if (g_str_has_prefix (arg, "vt")) { - /* Ignore VT args */ + vt_number = atoi (arg + 2); } else if (strcmp (arg, "-novtswitch") == 0) { @@ -297,10 +301,14 @@ main (int argc, char **argv) g_signal_connect (xserver, "client-connected", G_CALLBACK (client_connected_cb), NULL); g_signal_connect (xserver, "client-disconnected", G_CALLBACK (client_disconnected_cb), NULL); + status_text = g_string_new (""); + g_string_printf (status_text, "XSERVER-%d START", display_number); + if (vt_number >= 0) + g_string_append_printf (status_text, " VT=%d", vt_number); if (mir_id != NULL) - status_notify ("XSERVER-%d START MIR-ID=%s", display_number, mir_id); - else - status_notify ("XSERVER-%d START", display_number); + g_string_append_printf (status_text, " MIR-ID=%s", mir_id); + status_notify (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); diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c index ff90bac9..a30ff89f 100644 --- a/tests/src/libsystem.c +++ b/tests/src/libsystem.c @@ -957,9 +957,9 @@ static const char * get_env_value (const char *name_value, const char *name) { int j; - - for (j = 0; name[j] && name[j] != '=' && name[j] == name_value[j]; j++); - if (name_value[j] == '=') + + for (j = 0; name[j] && name_value[j] && name[j] == name_value[j]; j++); + if (name[j] == '\0' && name_value[j] == '=') return &name_value[j + 1]; return NULL; @@ -969,15 +969,21 @@ int pam_putenv (pam_handle_t *pamh, const char *name_value) { int i; + gchar *name; if (pamh == NULL || name_value == NULL) return PAM_SYSTEM_ERR; + name = strdup (name_value); + for (i = 0; name[i]; i++) + if (name[i] == '=') + name[i] = '\0'; for (i = 0; pamh->envlist[i]; i++) { - if (get_env_value (pamh->envlist[i], name_value)) + if (get_env_value (pamh->envlist[i], name)) break; } + free (name); if (pamh->envlist[i]) { diff --git a/tests/test-login1 b/tests/test-login1 new file mode 100755 index 00000000..9c4fba8d --- /dev/null +++ b/tests/test-login1 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner login1 test-gobject-greeter |