]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merged changes from parent branch.
authorJesús González <jgonzalez@gdr-sistemas.com>
Tue, 28 Apr 2015 00:12:04 +0000 (02:12 +0200)
committerJesús González <jgonzalez@gdr-sistemas.com>
Tue, 28 Apr 2015 00:12:04 +0000 (02:12 +0200)
285 files changed:
Makefile.am
NEWS
configure.ac
data/lightdm.conf
debian/50-greeter-wrapper.conf
debian/50-guest-wrapper.conf
debian/50-xserver-command.conf
debian/changelog
debian/lightdm.install
debian/patches/04_language_handling.patch
debian/po/af.po
debian/po/am.po
debian/po/an.po
debian/po/ar.po
debian/po/ast.po
debian/po/az.po
debian/po/be.po
debian/po/bg.po
debian/po/bn.po
debian/po/bo.po
debian/po/br.po
debian/po/bs.po
debian/po/ca.po
debian/po/ca@valencia.po
debian/po/ce.po
debian/po/ckb.po
debian/po/cs.po
debian/po/cy.po
debian/po/da.po
debian/po/de.po
debian/po/el.po
debian/po/en_AU.po
debian/po/en_CA.po
debian/po/en_GB.po
debian/po/eo.po
debian/po/es.po
debian/po/et.po
debian/po/eu.po
debian/po/fa.po
debian/po/fi.po
debian/po/fo.po
debian/po/fr.po
debian/po/fr_CA.po
debian/po/fy.po
debian/po/ga.po
debian/po/gd.po
debian/po/gl.po
debian/po/gu.po
debian/po/he.po
debian/po/hi.po
debian/po/hr.po
debian/po/ht.po
debian/po/hu.po
debian/po/hy.po
debian/po/ia.po
debian/po/id.po
debian/po/is.po
debian/po/it.po
debian/po/ja.po
debian/po/kk.po
debian/po/kl.po
debian/po/km.po
debian/po/kn.po
debian/po/ko.po
debian/po/ku.po
debian/po/lb.po
debian/po/lt.po
debian/po/lv.po
debian/po/mhr.po
debian/po/mi.po
debian/po/ml.po
debian/po/mr.po
debian/po/ms.po
debian/po/my.po
debian/po/nb.po
debian/po/nl.po
debian/po/nn.po
debian/po/oc.po
debian/po/pa.po
debian/po/pl.po
debian/po/pt.po
debian/po/pt_BR.po
debian/po/ro.po
debian/po/ru.po
debian/po/sc.po
debian/po/sd.po
debian/po/shn.po
debian/po/si.po
debian/po/sk.po
debian/po/sl.po
debian/po/sq.po
debian/po/sr.po
debian/po/sv.po
debian/po/ta.po
debian/po/te.po
debian/po/tg.po
debian/po/th.po
debian/po/tl.po
debian/po/tr.po
debian/po/ug.po
debian/po/uk.po
debian/po/ur.po
debian/po/uz.po
debian/po/vi.po
debian/po/wae.po
debian/po/zh_CN.po
debian/po/zh_HK.po
debian/po/zh_TW.po
liblightdm-gobject/greeter.c
src/greeter.c
src/lightdm.c
src/seat.c
src/session-child.c
src/session.c
src/unity-system-compositor.c
tests/Makefile.am
tests/scripts/0-additional.conf
tests/scripts/1-additional.conf
tests/scripts/additional-config-priority.conf
tests/scripts/additional-config.conf
tests/scripts/additional-system-config-priority.conf
tests/scripts/additional-system-config.conf
tests/scripts/autologin-guest-fail-setup-script.conf
tests/scripts/autologin-guest-in-background.conf
tests/scripts/autologin-guest-logout.conf
tests/scripts/autologin-guest-session-config.conf
tests/scripts/autologin-guest-timeout.conf
tests/scripts/autologin-guest.conf
tests/scripts/autologin-in-background.conf
tests/scripts/autologin-invalid-greeter.conf
tests/scripts/autologin-invalid-session.conf
tests/scripts/autologin-invalid-user.conf
tests/scripts/autologin-logout.conf
tests/scripts/autologin-new-authtok.conf
tests/scripts/autologin-pam-config.conf
tests/scripts/autologin-pam.conf
tests/scripts/autologin-password.conf
tests/scripts/autologin-previous-session.conf
tests/scripts/autologin-session-crash.conf
tests/scripts/autologin-session-error.conf
tests/scripts/autologin-timeout-in-background.conf
tests/scripts/autologin-timeout-logout.conf
tests/scripts/autologin-timeout.conf
tests/scripts/autologin-xserver-crash.conf
tests/scripts/autologin.conf
tests/scripts/console-kit.conf
tests/scripts/corrupt-xauthority.conf
tests/scripts/crash-authenticate.conf
tests/scripts/cred-error.conf
tests/scripts/cred-expired.conf
tests/scripts/cred-unavail.conf
tests/scripts/dbus.conf
tests/scripts/denied.conf
tests/scripts/expired.conf
tests/scripts/greeter-allow-guest.conf
tests/scripts/greeter-default-session.conf
tests/scripts/greeter-hide-users.conf
tests/scripts/greeter-show-manual-login.conf
tests/scripts/greeter-show-remote-login.conf
tests/scripts/greeter-wrapper.conf
tests/scripts/group-membership.conf
tests/scripts/guest-wrapper.conf
tests/scripts/home-dir-on-authenticate.conf
tests/scripts/home-dir-on-session.conf
tests/scripts/language-env.conf
tests/scripts/lock-seat-after-vt-switch.conf
tests/scripts/lock-seat-console-kit.conf
tests/scripts/lock-seat-resettable.conf
tests/scripts/lock-seat-return-session-console-kit.conf
tests/scripts/lock-seat-return-session.conf
tests/scripts/lock-seat.conf
tests/scripts/lock-session-no-password.conf
tests/scripts/lock-session-resettable.conf
tests/scripts/lock-session-return-session.conf
tests/scripts/lock-session.conf
tests/scripts/login-guest-disabled.conf
tests/scripts/login-guest-fail-setup-script.conf
tests/scripts/login-guest-logout.conf
tests/scripts/login-guest-pick-session.conf
tests/scripts/login-guest-session-config.conf
tests/scripts/login-guest.conf
tests/scripts/login-logout.conf
tests/scripts/login-manual.conf
tests/scripts/login-new-authtok.conf
tests/scripts/login-no-password.conf
tests/scripts/login-pam-config.conf
tests/scripts/login-pam.conf
tests/scripts/login-session-crash.conf
tests/scripts/login-xserver-crash.conf
tests/scripts/login.conf
tests/scripts/mir-autologin.conf
tests/scripts/mir-container-session.conf
tests/scripts/mir-script-hooks.conf
tests/scripts/mir-session-compositor-crash.conf
tests/scripts/mir-session-crash.conf
tests/scripts/mir-session.conf
tests/scripts/no-accounts-service.conf
tests/scripts/no-console-kit-or-login1.conf
tests/scripts/no-console-kit.conf
tests/scripts/no-login1.conf
tests/scripts/open-file-descriptors.conf
tests/scripts/script-hook-display-setup-fail.conf
tests/scripts/script-hook-display-setup-missing.conf
tests/scripts/script-hook-greeter-setup-fail.conf
tests/scripts/script-hook-greeter-setup-missing.conf
tests/scripts/script-hook-session-setup-fail.conf
tests/scripts/script-hook-session-setup-missing.conf
tests/scripts/script-hooks.conf
tests/scripts/seatdefaults-still-supported.conf [new file with mode: 0644]
tests/scripts/session-stderr-backup.conf
tests/scripts/session-stderr-multi-write.conf
tests/scripts/session-stderr.conf
tests/scripts/session-stdout.conf
tests/scripts/shared-data-greeter-to-session.conf
tests/scripts/shared-data-session-to-greeter-autologin.conf
tests/scripts/shared-data-session-to-greeter.conf
tests/scripts/switch-to-greeter-disabled.conf
tests/scripts/switch-to-greeter-new-session.conf
tests/scripts/switch-to-greeter-resettable.conf
tests/scripts/switch-to-greeter-return-session-logout.conf
tests/scripts/switch-to-greeter-return-session-pam.conf
tests/scripts/switch-to-greeter-return-session.conf
tests/scripts/switch-to-greeter.conf
tests/scripts/switch-to-guest-disabled.conf
tests/scripts/switch-to-guest-fail-resettable.conf
tests/scripts/switch-to-guest.conf
tests/scripts/switch-to-user-active.conf
tests/scripts/switch-to-user-disabled.conf
tests/scripts/switch-to-user-existing-no-password.conf
tests/scripts/switch-to-user-existing-resettable.conf
tests/scripts/switch-to-user-existing.conf
tests/scripts/switch-to-user-logout-active-resettable.conf
tests/scripts/switch-to-user-logout-active.conf
tests/scripts/switch-to-user-logout-inactive.conf
tests/scripts/switch-to-user-no-password.conf
tests/scripts/switch-to-user-resettable.conf
tests/scripts/switch-to-user.conf
tests/scripts/switch-to-users.conf
tests/scripts/system-xauthority.conf
tests/scripts/unity-autologin.conf
tests/scripts/unity-compositor-command.conf
tests/scripts/unity-compositor-crash.conf
tests/scripts/unity-compositor-fail-ready.conf
tests/scripts/unity-compositor-fail-start.conf
tests/scripts/unity-compositor-fallback.conf
tests/scripts/unity-compositor-mir-next-session.conf
tests/scripts/unity-compositor-next-session.conf
tests/scripts/unity-compositor-not-found.conf
tests/scripts/unity-login.conf
tests/scripts/unity-mir-autologin.conf
tests/scripts/unity-mir-greeter-mir-session.conf
tests/scripts/unity-mir-greeter-x-session.conf
tests/scripts/unity-mir-lock-seat.conf
tests/scripts/unity-mir-script-hooks.conf
tests/scripts/unity-mir-session-x-greeter.conf
tests/scripts/unity-mir-switch-to-user-resettable.conf
tests/scripts/unity-mir-switch.conf
tests/scripts/unity-plymouth.conf
tests/scripts/unity-script-hooks.conf
tests/scripts/unity-switch.conf
tests/scripts/upstart-autologin.conf
tests/scripts/upstart-login.conf
tests/scripts/user-logged-in.conf
tests/scripts/user-renamed-invalid.conf
tests/scripts/user-renamed.conf
tests/scripts/user-session.conf
tests/scripts/utmp-autologin.conf
tests/scripts/utmp-login.conf
tests/scripts/vnc-guest.conf
tests/scripts/vnc-login.conf
tests/scripts/vnc-open-file-descriptors.conf
tests/scripts/xauthority.conf
tests/scripts/xdg-current-desktop-legacy.conf
tests/scripts/xdg-current-desktop.conf
tests/scripts/xdmcp-client.conf
tests/scripts/xdmcp-server-autologin.conf
tests/scripts/xdmcp-server-double-login.conf
tests/scripts/xdmcp-server-guest.conf
tests/scripts/xdmcp-server-login.conf
tests/scripts/xdmcp-server-open-file-descriptors.conf
tests/scripts/xserver-no-share.conf
tests/src/libsystem.c
tests/src/test-runner.c
tests/src/unity-system-compositor.c
tests/test-seatdefaults-still-supported [new file with mode: 0755]

index 106e891e0fe38776fb37a83cba7d2d80ecad80f6..f9c4ebfe98bbd84ec2903a629708599cd2b04d5e 100644 (file)
@@ -1,8 +1,4 @@
-SUBDIRS = common
-if COMPILE_LIBLIGHTDM_GOBJECT
-SUBDIRS += liblightdm-gobject
-endif
-SUBDIRS += liblightdm-qt
+SUBDIRS = common liblightdm-gobject liblightdm-qt
 if COMPILE_TESTS
 SUBDIRS += tests
 endif
diff --git a/NEWS b/NEWS
index edf1499941dea4e9c3b6fd33959f4d8a4ff6becd..e2cadcab0feaf1078992f83c80937d4288f4dff5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+Overview of changes in lightdm 1.14.0
+
+    * Initialize file descriptor handles so we don't attempt to close stdin by
+      accident.
+    * Fix small errors detected by scan-build (clang).
+
+Overview of changes in lightdm 1.13.2
+
+    * Fix pipe file descriptor leak for each greeter session.
+    * Support active session changing via logind.
+    * Don't allow liblightdm-gobject to be disabled. It is required for
+      liblightdm-qt and the tests so it's not worth supporting builds without
+      it.
+    * Add bash autocompletion support
+
 Overview of changes in lightdm 1.13.1
 
     * Don't attempt generate D-Bus seat/session removal signals on shutdown.
index decd05ecc1f4e1fb928f1e2daa04155fd80ae66f..80c699b080541245c0c8638664a808034800ab23 100644 (file)
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(lightdm, 1.13.1)
+AC_INIT(lightdm, 1.14.0)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
@@ -68,39 +68,21 @@ PKG_CHECK_MODULES(XCB, [
     xcb
 ])    
 
-AC_ARG_ENABLE(liblightdm-gobject,
-       AS_HELP_STRING([--enable-liblightdm-gobject],[Enable LightDM client gobject libraries [[default=auto]]]),
-       [enable_liblightdm_gobject=$enableval],
-       [enable_liblightdm_gobject="auto"])
-compile_liblightdm_gobject=no
-if test x"$enable_liblightdm_gobject" = "xauto"; then
-    PKG_CHECK_MODULES(LIBLIGHTDM_GOBJECT, [
-        glib-2.0
-        gio-2.0 >= 2.26
-        gio-unix-2.0
-        gobject-2.0
-        libxklavier
-        x11
-    ], compile_liblightdm_gobject=yes, compile_liblightdm_gobject=no)
-elif test x"$enable_liblightdm_gobject" = "xyes"; then
-    PKG_CHECK_MODULES(LIBLIGHTDM_GOBJECT, [
-        glib-2.0
-        gio-2.0 >= 2.26
-        gio-unix-2.0
-        gobject-2.0
-        libxklavier
-        x11
-    ])
-    compile_liblightdm_gobject=yes
-fi
-AM_CONDITIONAL(COMPILE_LIBLIGHTDM_GOBJECT, test x"$compile_liblightdm_gobject" != "xno")
+PKG_CHECK_MODULES(LIBLIGHTDM_GOBJECT, [
+    glib-2.0
+    gio-2.0 >= 2.26
+    gio-unix-2.0
+    gobject-2.0
+    libxklavier
+    x11
+])
 
 AC_ARG_ENABLE(liblightdm-qt,
        AS_HELP_STRING([--enable-liblightdm-qt],[Enable LightDM client Qt4 libraries [[default=auto]]]),
        [enable_liblightdm_qt4=$enableval],
        [enable_liblightdm_qt4="auto"])
 compile_liblightdm_qt4=no
-if test x"$enable_liblightdm_qt4" = "xyes" -o \( x"$enable_liblightdm_qt4" = "xauto" -a x$compile_liblightdm_gobject = xyes \) ; then
+if test x"$enable_liblightdm_qt4" != "xno" ; then
     PKG_CHECK_MODULES(LIBLIGHTDM_QT4, [
         QtCore
         QtDBus
@@ -111,10 +93,6 @@ if test x"$enable_liblightdm_qt4" = "xyes" -o \( x"$enable_liblightdm_qt4" = "xa
      if test x"$(readlink $(which $MOC4))" = xqtchooser; then
          MOC4="$MOC4 --qt=qt4"
      fi
-     if test "x$compile_liblightdm_gobject" != xyes; then
-         AC_MSG_FAILURE(
-           [liblightdm-gobject is required to compile liblightdm-qt])
-     fi
     ],
     [if test "x$enable_liblightdm_qt4" != xauto; then
         AC_MSG_FAILURE(
@@ -241,7 +219,6 @@ echo "
         Greeter session:          $GREETER_SESSION
         Greeter user:             $GREETER_USER
         User session:             $USER_SESSION
-        liblightdm-gobject:       $compile_liblightdm_gobject
         GObject introspection:    $found_introspection
         liblightdm-qt:            $compile_liblightdm_qt4
         liblightdm-qt5:           $compile_liblightdm_qt5
index bfce79872667dd8b7475f29ed6ef6995f1d39b1e..d321175d66f21e3dd2e84442797e40bc40eb3fee 100644 (file)
@@ -35,6 +35,9 @@
 #
 # Seat defaults
 #
+# PLEASE NOTE: [SeatDefaults] section is deprecated and won't be supported in the future.
+#              Users are encouraged to update their lightdm.conf files, using [Seat:*] instead.
+#
 # type = Seat type (xlocal, xremote)
 # pam-service = PAM service to use for login
 # pam-autologin-service = PAM service to use for autologin
@@ -75,7 +78,7 @@
 # autologin-in-background = True if autologin session should not be immediately activated
 # exit-on-failure = True if the daemon should exit if this seat fails
 #
-[SeatDefaults]
+[Seat:*]
 #type=xlocal
 #pam-service=lightdm
 #pam-autologin-service=lightdm-autologin
 # Seat configuration
 #
 # Each seat must start with "Seat:".
-# Uses settings from [SeatDefaults], any of these can be overriden by setting them in this section.
+# Uses settings from [Seat:*], any of these can be overriden by setting them in this section.
 #
 #[Seat:0]
 
index 20f9d09ed7fcb8118a7cf5699069d6cd4293971c..42cdf2f8ff43b45b660a6056238a6c3077c24fd3 100644 (file)
@@ -1,2 +1,2 @@
-[SeatDefaults]
+[Seat:*]
 greeter-wrapper=/usr/lib/lightdm/lightdm-greeter-session
index 66b56875255245abdcc2915aa343b8078b6aa639..1db10acae10efc6aa1c5696390880f5f9b8007f1 100644 (file)
@@ -1,2 +1,2 @@
-[SeatDefaults]
+[Seat:*]
 guest-wrapper=/usr/lib/lightdm/lightdm-guest-session
index c7b2507a7a05643819da286a1308894ff237c13a..bf04d1b2d4516863bad00353acaba56a09b69029 100644 (file)
@@ -1,3 +1,3 @@
-[SeatDefaults]
+[Seat:*]
 # Dump core
 xserver-command=X -core
index 97ce59a4a57f5b0e68775effa153f2a62bffc5b1..d054ebdc30da089c4fc384facae8efbcb9a1397d 100644 (file)
@@ -1,3 +1,32 @@
+lightdm (1.14.0-0ubuntu2) vivid; urgency=medium
+
+  * Quiesce initctl errors when not running under upstart. (LP: #1414420)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 08 Apr 2015 14:37:17 +0200
+
+lightdm (1.14.0-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release:
+    - Initialize file descriptor handles so we don't attempt to close stdin by
+      accident.
+    - Fix small errors detected by scan-build (clang).
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Tue, 24 Mar 2015 10:25:22 +1300
+
+lightdm (1.13.2-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release:
+    - Fix pipe file descriptor leak for each greeter session. (LP: #1190344)
+    - Support active session changing via logind. (LP: #1371378)
+    - Don't allow liblightdm-gobject to be disabled. It is required for
+      liblightdm-qt and the tests so it's not worth supporting builds without
+      it.
+    - Add bash autocompletion support
+  * debian/lightdm.install:
+    - Install autocompletion configuration
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Tue, 10 Mar 2015 14:54:29 +1300
+
 lightdm (1.13.1-0ubuntu2) vivid; urgency=medium
 
   * debian/guest-account.sh:
index 27d46b65ac46756bf7f7eca4d2674f90a88d9ecb..53becd25020cde64e0af3ccece655e1c0c3f0fe9 100644 (file)
@@ -1,6 +1,7 @@
 usr/sbin/lightdm
 usr/share/man
 usr/share/locale
+usr/share/bash-completion
 usr/lib/lightdm
 usr/bin
 etc/dbus-1/
index 6c840712944c54e5c518b83d6746b0b77ad297d8..67d1c67350c0a2c2749c0bc24e24baf93530e4df 100644 (file)
@@ -75,7 +75,7 @@ Index: trunk/src/seat.c
 ===================================================================
 --- trunk.orig/src/seat.c
 +++ trunk/src/seat.c
-@@ -949,7 +949,7 @@ configure_session (Session *session, Ses
+@@ -997,7 +997,7 @@ configure_session (Session *session, Ses
      }
      if (language && language[0] != '\0')
      {
index 26ba52565eedb277725e8e2a63000064c561588c..ca459ff90e82e9149103ac09793d716eec427748 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 8b7a67fed647cadc68eb39389c38f0f4db05f65f..42a25e6fd4c2d97e4516e630241abf5123f6a7af 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 5d6e8c063ecd40320f3113e868131ba6ebc1aa9c..2094e0b085a9afabbe8a8b44b65e29625a34dcda 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index bbb985c02d6dcf63869821864e20fafa1e50f86b..4de437c639e2c72a4f950cc28408e33c25b1487f 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 8ccd94abab3d69fdfc7fd96a1c0554f2ce87cb95..c71e8f7ae5fe9dd5bbd2c2bad63973d742e3642b 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 186247f01003aa7cc314c69295c1631d5308eef2..8b6e956b71b30b8e47a1de5c8842d7b6722f94ac 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 71772a20fa48b6182a36ed9a43c0bb9441b6cff2..a73fb7e3aeacb7991c5fe38d36d0650e910e8908 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 54e85a93e728e94aae28ab2bad22a1600ebd9c4b..5896518b4fe0c0bba934e67e226ff7e9707bd369 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 01d44f41a3e638c8b9551728b619980341e36a15..716879ea0498102f48b3a05bf1fe63e70259626c 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 421382653968d214adbdecb6fd27355f5e3fe21b..e1063a7626c52d56d61efa60e173ec260ab310aa 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 59181632439fdcbfb77c0de80b07f49b85aa5da3..86035328a7d863e69209d65b94eaab7bc210c91b 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 3f3940300af449f09773c2b1132b61acbd6a925c..8c12e7e5570c5bf4d7a1d32710ceb3bfc1f828a9 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index ea8da83ea5f613d9e4c93d8a6bb5695c6cdaba0b..92e31aa9dd2e3ac5714b651ad3a1807f19a8be63 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index c663550db64d1403cb564b6b2da5b1bcf88d649c..6570bc807549080d53fbb69f79f73acbb2c26dcf 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
@@ -68,17 +68,3 @@ msgstr ""
 
 #~ msgid "Restart"
 #~ msgstr "Reinicia"
-
-#~ msgid ""
-#~ "Are you sure you want to close all programs and shutdown the computer?"
-#~ msgstr ""
-#~ "Esteu segur que voleu tancar tots els programes i aturar l'ordinador?"
-
-#~ msgid "Shutdown"
-#~ msgstr "Atura"
-
-#~ msgid "Shutdown..."
-#~ msgstr "Atura..."
-
-#~ msgid "Suspend"
-#~ msgstr "Atura temporalment"
index 884154bf66333d52e29758a50307c6deb496a642..26816cc33cd9cfaf255d3bb390961be4a6de6d59 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 9893a7f21727fcf4c8d21239a30345864c3dbbe6..70315cd4d1ad08f4c6c61799cb37e9648bd4827c 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 5a9c95017521cb2fb37ac243912616d878d1987b..e2694fc5525a0774dc5d3194c4463529c7560878 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index c0b6ad4b98f02fa900f38674e71cae5ce7fb14dc..71aaf46b1f14abe4dba5c3d35014fa9722444437 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 3cd290fb862a0edcd8f08c812379d6a38599b135..125103ae91b7f59d3be480bf326014b6669db588 100644 (file)
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 5bcc2ed5ab45818c3b3b1b885094cfceda00024a..a046d113176dcd73dc3f81d48933380f956c936a 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 4ebb1f01f4967c80be6da98b4b8d0a7a89656ace..72c941d97b31e0640f924157f2e3cdc951cacbae 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 7206525d1bc7efc774d8f9f8322e4c9bd2c65e4c..d73720f81b076177b7a0e8b93713c718080ee92a 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 1420eda91597550bcf5c24acbd619efecb7f50b3..5700d92fe7c62a4578dfdc2e5e44b8764a901ff0 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index daa3264ddec1bf85de277d9458b761ea1722ccc9..d320afd659aa0fc8ae1c0bee9ee15f64fc32773c 100644 (file)
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: lightdm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2007-05-31 08:04+0200\n"
-"PO-Revision-Date: 2011-10-29 16:01+0000\n"
-"Last-Translator: Lazlo <Unknown>\n"
+"PO-Revision-Date: 2015-04-13 10:29+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
 #: ../lightdm.templates:2001
 msgid "Default display manager:"
-msgstr ""
+msgstr "Default display manager:"
 
 #. Type: select
 #. Description
@@ -30,6 +30,8 @@ msgid ""
 "A display manager is a program that provides graphical login capabilities "
 "for the X Window System."
 msgstr ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
 
 #. Type: select
 #. Description
@@ -39,6 +41,9 @@ msgid ""
 "manager packages are installed. Please select which display manager should "
 "run by default."
 msgstr ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
 
 #. Type: select
 #. Description
@@ -49,6 +54,10 @@ msgid ""
 "accordingly, edit each of their init scripts in /etc/init.d, and disable the "
 "check for a default display manager."
 msgstr ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
 
 #~ msgid "Large Font"
 #~ msgstr "Large Font"
index 0f248f4b69ae2b37a10ba70ab49d8cba055f090f..8cf7640371752b8d4a193b5ea04444e398285cdc 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 9e4fb2414e3ec7a4179d546b314f931fed62ba9f..1b51ad29baad537843803295cbc9bc384f9c6974 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index b217339b44b2fc2a2c4e743bf807f4b844bfbd54..c079a7ace8db50b0fe72a40bf06989ac67a9c289 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 6b344e81012b772484395e9a1ff1998e045e65ac..f3aa083fde3c90fc818bad0af6994c72daa5a26a 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index a7baa510dd7ce0d4b45cb4b5a132b0fff9db79bc..37ec3eb808a2d036d7e0719757703444079257bc 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 004e544b3386875ddfd61b9e773caa7ca0063d0b..5e16981e9dd42f18297bc51cc3f646850c95c82d 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index bf8a60ef152c56f3803b2a156b236b4e4123390e..436cafe5f68b8835f7d713d70f5a4a64e30f365f 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index aee0c3f72a6bc738d61495de63062707cce0f73e..972e864dfc58990b84066022cbefea2b71faf470 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index c9d29c9f503a839a5c4fd6e57798f9331058cd25..0fb4e8149145bff15f847588b55f3c72e0aadd78 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 95f78c2ced71b1fc32e94b40caae540a86989ce1..bf2933fb38bb9e31e095311f684272c8268bcbf9 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 96a3f2d5204c34f67670986c0112bcd5711d27d6..ee593ffd2389d77a8cbc72f156d5846b8c3334f1 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index e2fec4dcd211b2747c6e56b711071a35300ebaeb..523c8195b938aebdb8e63d95fcb97b651f65a5ab 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 251ba9b8a142b14103bd0754b575a9e4cf5885f3..3f8dcf5f131d26dbd8b726beb6fa2081266b2235 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 9a7e04a068122b101188ff9765dcfd45567a79ff..c54a49bfb84b5640f406975dba5fe3fa4c488b7c 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 6f4a8d84e047fe5c94dc8148f36e84e5762ae7d7..a5fd5bcafc0e549d00de8e11b0e26362a2356365 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 47d4691d07c8e072b21a3b8a28bb371c45f66087..374e453fe8373cedf7a293c96eecaf06f1649ae4 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 0867de38bffaf3e8670957afbe4fd2e28e340b09..ebdb2316bf355580d61d8eb1c0f6535ba943264d 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 7d2702f507a92796eb4f8b318be5f18b7fcef8a5..15448c6d1aca0a3c493d63236b2ecd64797e0d30 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index fca518a0ca995d8dc7f33e86838c91f40271a07a..21702c686e7f2c98ab0c5bc94b999741f8c20fbb 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 4bcc81c3ed807f56a19c48891de9a454b507c9b4..1b9b277e004bdae27346e005a7b66bb5bd54962e 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index de0ac849d022d8ad2c4bd7e26041017006067834..3896dc946f8f309f37b4c0d07480a80c2ce1d3ee 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 995f385675dbcff276ffb0ab394234cebe29819c..57ec0aa5254270c93343c0d032f0ed34c6a7c529 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
@@ -53,9 +53,6 @@ msgstr ""
 #~ msgid "Cancel"
 #~ msgstr "Batal"
 
-#~ msgid "Restart"
-#~ msgstr "Nyalakan Ulang"
-
 #~ msgid "Shutdown"
 #~ msgstr "Matikan"
 
@@ -70,13 +67,3 @@ msgstr ""
 
 #~ msgid "Suspend"
 #~ msgstr "Suspensi"
-
-#~ msgid "Are you sure you want to close all programs and restart the computer?"
-#~ msgstr "Tutup semua program dan nyalakan ulang komputer?"
-
-#~ msgid ""
-#~ "Are you sure you want to close all programs and shutdown the computer?"
-#~ msgstr "Tutup semua program dan matikan komputer?"
-
-#~ msgid "Restart..."
-#~ msgstr "Nyalakan Ulang..."
index ee91c9c2fcbb44398011149172a37ed82453d208..9d0bc2a8a5ce7e0294370810e6c2582366b04c6b 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 9e97e516ec9ae440cfa7aa94e9dcdc7c84a58245..fc00ec1db014fc5d644d1ffcdb633ed47c5889c9 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 6110360722690fb151302ce1b12e58f01291b50e..af8008a2d6b10f0f022655662c54da35a82467f7 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 807bac9c721f7e0e5d3cb1ea530bdf8068d0d966..9a57b589572da030ac9106e1a39c0b7332504f3e 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index ea00a8ec0a7c81f614ce48a9ae2e52ce29e35f79..f3385383c3902f59a5778ec08947e058211345f3 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 6ea6d3deed0a4f6bacb5fe9c279eceefb9b8da54..26bcc22bd1b5ddac47b8b1ebc011f1e3b5e5d133 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 43c57c9b4b9afedb37af92ab7f46b7f920dcb077..59b9c3b82095e4c47499825bdd1b72a8af52a87e 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index fbfa9dbe33807653d77d57ed292d967cba4843f1..028e2a4bd44b7bf0550d6010f795b3e3ffe218aa 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 045baf1f04cbf4fe6765290d54d880e8483dcc15..ad0672d8a68468efa584cbe1413da9a06f6127a8 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 0b0238ccdd2966de3d3df0dd674c45441740b123..00d57306f3a83c3a0dede14c3a8b89bfcd3deffe 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 54760a4aeeb5da1705f69c2e5abf112917e4e20b..98ea09e811595f20a786a8728239354cf1a444b5 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 33ce1b866a13592f3f06642f02f576b7bb06e720..067ecde87fa22ec53325acbb7e3cbaf44d99f8b3 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index fab1af5a3372d17667c21059815c4e9d696278b5..80d9ffe0650128e3f3676e22a8b304b0a3f0aa27 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 3f4755943a3f03917b42ab3339ac4f88e193941c..88df85b93f3651750bf699052e66a55773d8a737 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index f65edd369752ded5f7bb287777eb93c121b8398c..1e2ba50fb464fe3066da5fd7af859400e13b6431 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index ae268c98f029e9e76f27f2a447eb6173476d5326..e09ddc00396f5a46729b6915bd3a13e6969d8130 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 6c32fd54d59726c3e89e7f2db83c29ec3bb1adb5..e35c9716cefab8f2d18394ee0e29567c756deacd 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 54c4d21e47be79cc53971d9b933413d70aa534b3..84ff47d9921dcc0672abfe0f53b2e8e7f9ee91b5 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index e5d69cdab133fe7dc49f23ab0d7ce5269f9709c6..c4091362d71cfa31cddecc267afdc0476e030194 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 59e21d27b25f13c67f447aec359ce4ab815cc8b9..982238d49c5b246fd49aa9c491b222b5dc69dfd3 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index dd3ab4325d33e5ccd6f6d9e1a38eda18890bbb2e..a284eae60fa9c0f74aca990f5575e06964548bc2 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index f32a9ffffa7e9ba31359e0aa796624eacbe3173f..4a125cabf62a2ace97a97e9097015776d4bffdf7 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 34eef38fc489000e4ac4b02c2210ac6a9b26c10e..347e3879985150f8d182d0dcd52ff1bcd281ecee 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 2d43d6808e480f9f3ec6fc40c7afb743229ffd29..61aa36e21564b2bcdfdfe91c6a95f74602f6f935 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index af0b608feb4f0732cabc46051e30f6b7ffa7c118..a77bde57ca22590d5fc819502b52cc02b22103da 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 6352aa4b8d3265e0b1ed51831b4c7eeb66f1b499..51277570d217360caa3b6150e755d5606e8f198f 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 985a712e1df04035af51f912cad8ef584ef28563..5d97c299d23e8eb870f6186307a3af4768fe1272 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index ffffcc4fc1182f48ccf523e43f1c7eaa98eecf93..91ae2972971ba68a2d90489299b1093a02d5dfd3 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index e37fa82058a74ae757673e4bfb18eb177cca2d45..0c2507d3d7653bb48221c908238ed1d62e74679d 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index c1fb498289786e7bd081624e569466d727febca7..8d19b0ef614e0bffcf540c247ad92f06ff671f0a 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 224e3fdf0d04fc31820d07313479632279723251..6f2fedfb9499077af2ff894f505908fbc3a233af 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 6219955f177042bcd85a60283ac8c6d7f214a66b..82788cc1a17e474aa78484b186396d017251d6b9 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index e1ad0bd442fb20b006a17853d8420c4a62ba3e04..746c5e7e5afdee7f2f0403ca481a9a3d5b55735d 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 075a225b2f916d50e278939f2f4574504218213e..f6898c713d0eaee6ac5e24b9a684f53e1f52297a 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
@@ -80,6 +80,3 @@ msgstr ""
 
 #~ msgid "Shutdown"
 #~ msgstr "Izklopi"
-
-#~ msgid "Suspend"
-#~ msgstr "V pripravljenost"
index 3324fa104600d7e4181f9aa3cce651012ab6af3f..323e95be033c3abc4e9321774f653d26fe60cbca 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:30+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 130442aa74482b25954e99e6b425edb8be1bdad8..b244b10023f255eb142ba76649d06e5db4f23219 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 "Language: sr\n"
 
 #. Type: select
index 6ed59bfcf431bba05278fb7b5693e1baa3c2842e..b5c2b721cc77e014e82f4edc4614d2bfa547bf8f 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index bec8ad1c37196a30e3db85d20213ef667b7e5776..942b3c92a927746709a75e7d5bfce4040327f970 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index cd7b0cdef37891b80a9712b8ca5cce77fa4b0b51..e5b8fd60c8243266925fd0f6bcfc3cda706292c3 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 28bd16b48cf0a24981d9c99f1d8614aff07a80a3..59cb5456976b0f8712ce3fba150d7bb8eaf32640 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 33d3afd2674b5f9c443ce4a1fabaf98433709845..f4c73ae7a20f75c2478765c9cead3bd9d62f1837 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index ecc1456e2456320b69abee35214e1abce975b338..e9a685a5009e2f8cb20f59fe58766d08ab3cd651 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 4078ed9438cabafc34721f8f45c3f50f07ceb770..1e6dc50d90786472387a0adaf3cc7af81dcf27e4 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
@@ -89,6 +89,3 @@ msgstr ""
 
 #~ msgid "Suspend"
 #~ msgstr "Askıya Al"
-
-#~ msgid "Shutdown..."
-#~ msgstr "Kapat..."
index b245f4200b756b4a6c291b1e1337d15927cbdbfd..fff6b4e16be229bd8344cdd6f48bd3cb608a4965 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 9c6faac2488fbe51260a17c0f7c4baedb9ad2b19..05f7c40c576133a10ae4fd53a6c78a5dd9010787 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index d576097f5d7988bd32398c82991253e53136eb1d..52da48364e2d93e3482c11f33168718e8ff21eff 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 42552cbeac2733ce808af2df6297c9184acecefc..0eeda05df8b16f05bcb1a69db6a24e363b18a1bc 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 010a2ed1dfeec80278c186f31c0035d956b15915..56c8b7ce35cd3440ff4b5b06eb28b98f85743633 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 5f30cb5b6b1696b21531b75a5994e716e17cea8b..3e57bbf2e01a4b25808929839478675e2dcc42cc 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 3fc0d64cbf5b6e2bb68cfdd8175a7b7ed0c08cf7..e4f10b1e6b0d8c9ce9de845567c7618c00f6510e 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 4ff97516f34814385cda1712a6bc10ee4467ee2f..3f193c6919e6cfe791006c8a46c833c892791d30 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 5d52916853ce39b98d9ed79b4153e3f4029544b9..57d9e17d29e7519b0a3ef5acd47de2c79a4a73f9 100644 (file)
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-03 07:31+0000\n"
-"X-Generator: Launchpad (build 17330)\n"
+"X-Launchpad-Export-Date: 2015-04-23 06:03+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Type: select
 #. Description
index 1c281450b9f23df4c3cd32fbaf8ec982dab6bc1f..7b1c90c1e216079eddebcf70166491a94e00461d 100644 (file)
@@ -243,7 +243,8 @@ write_string (guint8 *buffer, gint buffer_length, const gchar *value, gsize *off
     write_int (buffer, buffer_length, length, offset);
     if (*offset + length >= buffer_length)
         return;
-    memcpy (buffer + *offset, value, length);
+    if (value)
+        memcpy (buffer + *offset, value, length);
     *offset += length;
 }
 
index e1d47f86354c4f6d292fd54c848e0b5e6444033e..b9f4f55a9ee2eb5cd68214d3b1fc511f8d268a04 100644 (file)
@@ -76,6 +76,8 @@ struct GreeterPrivate
     gboolean guest_account_authenticated;
 
     /* Communication channels to communicate with */
+    int to_greeter_input;
+    int from_greeter_output;
     GIOChannel *to_greeter_channel;
     GIOChannel *from_greeter_channel;
     guint from_greeter_watch;
@@ -954,6 +956,7 @@ greeter_start (Session *session)
 {
     Greeter *greeter = GREETER (session);
     int to_greeter_pipe[2], from_greeter_pipe[2];
+    int to_greeter_output, from_greeter_input;
     gboolean result = FALSE;
     gchar *value;
     GError *error = NULL;
@@ -964,12 +967,16 @@ greeter_start (Session *session)
         g_warning ("Failed to create pipes: %s", strerror (errno));
         return FALSE;
     }
-    greeter->priv->to_greeter_channel = g_io_channel_unix_new (to_greeter_pipe[1]);
+    to_greeter_output = to_greeter_pipe[0];
+    greeter->priv->to_greeter_input = to_greeter_pipe[1];
+    greeter->priv->to_greeter_channel = g_io_channel_unix_new (greeter->priv->to_greeter_input);
     g_io_channel_set_encoding (greeter->priv->to_greeter_channel, NULL, &error);
     if (error)
         g_warning ("Failed to set encoding on to greeter channel to binary: %s\n", error->message);
     g_clear_error (&error);
-    greeter->priv->from_greeter_channel = g_io_channel_unix_new (from_greeter_pipe[0]);
+    greeter->priv->from_greeter_output = from_greeter_pipe[0];
+    from_greeter_input = from_greeter_pipe[1];
+    greeter->priv->from_greeter_channel = g_io_channel_unix_new (greeter->priv->from_greeter_output);
     g_io_channel_set_encoding (greeter->priv->from_greeter_channel, NULL, &error);
     if (error)
         g_warning ("Failed to set encoding on from greeter channel to binary: %s\n", error->message);
@@ -978,22 +985,22 @@ greeter_start (Session *session)
     greeter->priv->from_greeter_watch = g_io_add_watch (greeter->priv->from_greeter_channel, G_IO_IN | G_IO_HUP, read_cb, greeter);
 
     /* Let the greeter session know how to communicate with the daemon */
-    value = g_strdup_printf ("%d", from_greeter_pipe[1]);
+    value = g_strdup_printf ("%d", from_greeter_input);
     session_set_env (SESSION (greeter), "LIGHTDM_TO_SERVER_FD", value);
     g_free (value);
-    value = g_strdup_printf ("%d", to_greeter_pipe[0]);
+    value = g_strdup_printf ("%d", to_greeter_output);
     session_set_env (SESSION (greeter), "LIGHTDM_FROM_SERVER_FD", value);
     g_free (value);
 
     /* Don't allow the daemon end of the pipes to be accessed in child processes */
-    fcntl (to_greeter_pipe[1], F_SETFD, FD_CLOEXEC);
-    fcntl (from_greeter_pipe[0], F_SETFD, FD_CLOEXEC);
+    fcntl (greeter->priv->to_greeter_input, F_SETFD, FD_CLOEXEC);
+    fcntl (greeter->priv->from_greeter_output, F_SETFD, FD_CLOEXEC);
 
     result = SESSION_CLASS (greeter_parent_class)->start (session);
 
     /* Close the session ends of the pipe */
-    close (to_greeter_pipe[0]);
-    close (from_greeter_pipe[1]);
+    close (to_greeter_output);
+    close (from_greeter_input);
 
     return result;
 }
@@ -1029,6 +1036,8 @@ greeter_init (Greeter *greeter)
     greeter->priv->read_buffer = secure_malloc (greeter, HEADER_SIZE);
     greeter->priv->hints = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
     greeter->priv->use_secure_memory = config_get_boolean (config_get_instance (), "LightDM", "lock-memory");
+    greeter->priv->to_greeter_input = -1;
+    greeter->priv->from_greeter_output = -1;
 }
 
 static void
@@ -1049,6 +1058,8 @@ greeter_finalize (GObject *object)
         g_signal_handlers_disconnect_matched (self->priv->authentication_session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self);
         g_object_unref (self->priv->authentication_session);
     }
+    close (self->priv->to_greeter_input);
+    close (self->priv->from_greeter_output);
     if (self->priv->to_greeter_channel)
         g_io_channel_unref (self->priv->to_greeter_channel);
     if (self->priv->from_greeter_channel)
index 8c52d1e194189acd8318c0934ea980825abb16d5..61ae3f2ca831e9cfb3971d71f3add295f8cae778 100644 (file)
@@ -153,18 +153,16 @@ get_config_sections (const gchar *seat_name)
     gchar **groups, **i;
     GList *config_sections = NULL;
 
+    /* Keep this so it won't break existing config files using old [SeatDefaults] */
     config_sections = g_list_append (config_sections, g_strdup ("SeatDefaults"));
 
-    if (!seat_name)
-        return config_sections;
-
     groups = config_get_groups (config_get_instance ());
     for (i = groups; *i; i++)
     {
         if (g_str_has_prefix (*i, "Seat:"))
         {
             const gchar *seat_name_glob = *i + strlen ("Seat:");
-            if (g_pattern_match_simple (seat_name_glob, seat_name))
+            if (g_pattern_match_simple (seat_name_glob, seat_name ? seat_name : ""))
                 config_sections = g_list_append (config_sections, g_strdup (*i));
         }
     }
@@ -184,8 +182,13 @@ set_seat_properties (Seat *seat, const gchar *seat_name)
     for (link = sections; link; link = link->next)
     {
         const gchar *section = link->data;
-        g_debug ("Loading properties from config section %s", section);
         keys = config_get_keys (config_get_instance (), section);
+
+        /* Keep this until [SeatDefaults] support is definitely removed */
+        if (strcmp (section, "SeatDefaults") == 0 && keys)
+            l_warning (seat, "[SeatDefaults] is deprecated and won't be supported in the future. Use [Seat:*] instead!");
+
+        l_debug (seat, "Loading properties from config section %s", section);
         for (i = 0; keys && keys[i]; i++)
         {
             gchar *value = config_get_string (config_get_instance (), section, keys[i]);
@@ -646,7 +649,6 @@ running_user_session_cb (Seat *seat, Session *session)
     session_set_env (session, "XDG_SESSION_PATH", path);
     g_object_set_data_full (G_OBJECT (session), "XDG_SESSION_PATH", path, g_free);
 
-    seat_entry = g_hash_table_lookup (seat_bus_entries, seat);
     session_entry = session_bus_entry_new (g_object_get_data (G_OBJECT (session), "XDG_SESSION_PATH"), seat_entry ? seat_entry->path : NULL);
     g_hash_table_insert (session_bus_entries, g_object_ref (session), session_entry);
 
@@ -1370,36 +1372,36 @@ main (int argc, char **argv)
         config_set_string (config_get_instance (), "LightDM", "greeter-user", GREETER_USER);
     if (!config_has_key (config_get_instance (), "LightDM", "lock-memory"))
         config_set_boolean (config_get_instance (), "LightDM", "lock-memory", TRUE);
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "type"))
-        config_set_string (config_get_instance (), "SeatDefaults", "type", "xlocal");
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "pam-service"))
-        config_set_string (config_get_instance (), "SeatDefaults", "pam-service", "lightdm");
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "pam-autologin-service"))
-        config_set_string (config_get_instance (), "SeatDefaults", "pam-autologin-service", "lightdm-autologin");
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "pam-greeter-service"))
-        config_set_string (config_get_instance (), "SeatDefaults", "pam-greeter-service", "lightdm-greeter");
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "xserver-command"))
-        config_set_string (config_get_instance (), "SeatDefaults", "xserver-command", "X");
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "xserver-share"))
-        config_set_boolean (config_get_instance (), "SeatDefaults", "xserver-share", TRUE);
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "unity-compositor-command"))
-        config_set_string (config_get_instance (), "SeatDefaults", "unity-compositor-command", "unity-system-compositor");
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "start-session"))
-        config_set_boolean (config_get_instance (), "SeatDefaults", "start-session", TRUE);
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "allow-user-switching"))
-        config_set_boolean (config_get_instance (), "SeatDefaults", "allow-user-switching", TRUE);
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "allow-guest"))
-        config_set_boolean (config_get_instance (), "SeatDefaults", "allow-guest", TRUE);
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "greeter-allow-guest"))
-        config_set_boolean (config_get_instance (), "SeatDefaults", "greeter-allow-guest", TRUE);
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "greeter-show-remote-login"))
-        config_set_boolean (config_get_instance (), "SeatDefaults", "greeter-show-remote-login", TRUE);
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "greeter-session"))
-        config_set_string (config_get_instance (), "SeatDefaults", "greeter-session", GREETER_SESSION);
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "user-session"))
-        config_set_string (config_get_instance (), "SeatDefaults", "user-session", USER_SESSION);
-    if (!config_has_key (config_get_instance (), "SeatDefaults", "session-wrapper"))
-        config_set_string (config_get_instance (), "SeatDefaults", "session-wrapper", "lightdm-session");
+    if (!config_has_key (config_get_instance (), "Seat:*", "type"))
+        config_set_string (config_get_instance (), "Seat:*", "type", "xlocal");
+    if (!config_has_key (config_get_instance (), "Seat:*", "pam-service"))
+        config_set_string (config_get_instance (), "Seat:*", "pam-service", "lightdm");
+    if (!config_has_key (config_get_instance (), "Seat:*", "pam-autologin-service"))
+        config_set_string (config_get_instance (), "Seat:*", "pam-autologin-service", "lightdm-autologin");
+    if (!config_has_key (config_get_instance (), "Seat:*", "pam-greeter-service"))
+        config_set_string (config_get_instance (), "Seat:*", "pam-greeter-service", "lightdm-greeter");
+    if (!config_has_key (config_get_instance (), "Seat:*", "xserver-command"))
+        config_set_string (config_get_instance (), "Seat:*", "xserver-command", "X");
+    if (!config_has_key (config_get_instance (), "Seat:*", "xserver-share"))
+        config_set_boolean (config_get_instance (), "Seat:*", "xserver-share", TRUE);
+    if (!config_has_key (config_get_instance (), "Seat:*", "unity-compositor-command"))
+        config_set_string (config_get_instance (), "Seat:*", "unity-compositor-command", "unity-system-compositor");
+    if (!config_has_key (config_get_instance (), "Seat:*", "start-session"))
+        config_set_boolean (config_get_instance (), "Seat:*", "start-session", TRUE);
+    if (!config_has_key (config_get_instance (), "Seat:*", "allow-user-switching"))
+        config_set_boolean (config_get_instance (), "Seat:*", "allow-user-switching", TRUE);
+    if (!config_has_key (config_get_instance (), "Seat:*", "allow-guest"))
+        config_set_boolean (config_get_instance (), "Seat:*", "allow-guest", TRUE);
+    if (!config_has_key (config_get_instance (), "Seat:*", "greeter-allow-guest"))
+        config_set_boolean (config_get_instance (), "Seat:*", "greeter-allow-guest", TRUE);
+    if (!config_has_key (config_get_instance (), "Seat:*", "greeter-show-remote-login"))
+        config_set_boolean (config_get_instance (), "Seat:*", "greeter-show-remote-login", TRUE);
+    if (!config_has_key (config_get_instance (), "Seat:*", "greeter-session"))
+        config_set_string (config_get_instance (), "Seat:*", "greeter-session", GREETER_SESSION);
+    if (!config_has_key (config_get_instance (), "Seat:*", "user-session"))
+        config_set_string (config_get_instance (), "Seat:*", "user-session", USER_SESSION);
+    if (!config_has_key (config_get_instance (), "Seat:*", "session-wrapper"))
+        config_set_string (config_get_instance (), "Seat:*", "session-wrapper", "lightdm-session");
     if (!config_has_key (config_get_instance (), "LightDM", "log-directory"))
         config_set_string (config_get_instance (), "LightDM", "log-directory", default_log_dir);
     g_free (default_log_dir);
@@ -1498,7 +1500,7 @@ main (int argc, char **argv)
 
             g_debug ("Adding default seat");
 
-            types = config_get_string_list (config_get_instance (), "SeatDefaults", "type");
+            types = config_get_string_list (config_get_instance (), "Seat:*", "type");
             for (type = types; type && *type; type++)
             {
                 seat = seat_new (*type, "seat0");
index cc2ddbd42243a2d1b8bba5fb03a63783f33f720a..58a5ec2e6af32bcc40162ad940c9ff44171be490 100644 (file)
@@ -397,13 +397,15 @@ emit_upstart_signal (const gchar *signal)
 {
     g_return_if_fail (signal != NULL);
     g_return_if_fail (signal[0] != 0);
+    const gchar* argv[] = {"initctl", "-q", "emit", signal, "DISPLAY_MANAGER=lightdm", NULL};
 
     if (getuid () != 0)
         return;
 
-    gchar *cmd = g_strdup_printf ("initctl -q emit %s DISPLAY_MANAGER=lightdm", signal);
-    g_spawn_command_line_async (cmd, NULL); /* OK if it fails, probably not installed */
-    g_free (cmd);
+    /* OK if it fails, probably not installed or not running upstart */
+    g_spawn_async (NULL, argv, NULL,
+            G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
+            NULL, NULL, NULL, NULL);
 }
 
 static void
index 535aab9a60b1eb3b275efc6afa7cff1a4f6b6ae7..e85f57da27073059235748217e100dc64470f3ea 100644 (file)
@@ -768,7 +768,7 @@ session_child_run (int argc, char **argv)
     pam_close_session (pam_handle, 0);
 
     /* Remove credentials */
-    result = pam_setcred (pam_handle, PAM_DELETE_CRED);
+    pam_setcred (pam_handle, PAM_DELETE_CRED);
 
     pam_end (pam_handle, 0);
     pam_handle = NULL;
index 26d0ce9752f9993760fa761d55efdeb96a97e501..e25a69a59e9bc9c8d08798a764bf58b667479d31 100644 (file)
@@ -910,6 +910,8 @@ session_init (Session *session)
 {
     session->priv = G_TYPE_INSTANCE_GET_PRIVATE (session, SESSION_TYPE, SessionPrivate);
     session->priv->log_filename = g_strdup (".xsession-errors");
+    session->priv->to_child_input = -1;
+    session->priv->from_child_output = -1;
 }
 
 static void
index 03824284279203bfead59ec7a4a144ccc8acb8e9..f4b74eb18d37575a1ba4d9b6647c4770dca96b86 100644 (file)
@@ -147,7 +147,8 @@ write_message (UnitySystemCompositor *compositor, guint16 id, const guint8 *payl
     data[1] = id & 0xFF;
     data[2] = payload_length >> 8;
     data[3] = payload_length & 0xFF;
-    memcpy (data + 4, payload, payload_length);
+    if (payload)
+        memcpy (data + 4, payload, payload_length);
 
     errno = 0;
     if (write (compositor->priv->to_compositor_pipe[1], data, data_length) != data_length)
index b64e1ffc6fdee4dc00bebaca6a4fe394709d1495..d82c0fe313a1e8c3f107a7b0d3ec0b830ab2da06 100644 (file)
@@ -220,7 +220,8 @@ TESTS = \
        test-unity-mir-session-x-greeter \
        test-unity-mir-switch \
        test-unity-mir-switch-to-user-resettable \
-       test-unity-mir-script-hooks
+       test-unity-mir-script-hooks \
+       test-seatdefaults-still-supported
 
 #      test-mir-script-hooks \
 #      test-session-exit-error
@@ -413,8 +414,8 @@ EXTRA_DIST = \
        scripts/language-env.conf \
        scripts/language-no-accounts-service.conf \
        scripts/lock-seat.conf \
-       scripts/lock-seat-after-vt-switch.conf
-       scripts/lock-seat-console-kit.conf \
+       scripts/lock-seat-after-vt-switch.conf \
+       scripts/lock-seat-console-kit.conf \    
        scripts/lock-seat-resettable.conf \
        scripts/lock-seat-return-session.conf \
        scripts/lock-seat-return-session-console-kit.conf \
@@ -576,4 +577,5 @@ EXTRA_DIST = \
        scripts/xdmcp-server-login.conf \
        scripts/xdmcp-server-open-file-descriptors.conf \
        scripts/xserver-fail-start.conf \
-       scripts/xserver-no-share.conf
+       scripts/xserver-no-share.conf \
+       scripts/seatdefaults-still-supported.conf
index 16dd53c567957415614a6ccb97b17f5b700d84d9..9a8aa224b2b5198f7cee6e744db1e4a752ead638 100644 (file)
@@ -1,2 +1,2 @@
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
index 07fa3d93c90548d986fd553c704728788e28b50a..906264f42fc0dae2ca478690767a9352e125daaa 100644 (file)
@@ -1,2 +1,2 @@
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password2
index 3ab14c98c77b075e53a2f157341d1fd97045d292..7fb82ef90d915da02910aeb62142bbb9c106904d 100644 (file)
@@ -5,7 +5,7 @@
 [test-runner-config]
 additional-config=0-additional.conf
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password2
 user-session=default
 
index d5e215c5ddf71204c1f05932a80e725c6df55dd7..75cf0b698a65f70b7ddda52deb59ae6ce672035d 100644 (file)
@@ -5,7 +5,7 @@
 [test-runner-config]
 additional-config=0-additional.conf 1-additional.conf
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index b19a3a2f65ee9c6c2b3fc9a6db5bd2d7a0eedbe7..feb2523d34ae38e70d1a6a81ce0586cc95aa51fc 100644 (file)
@@ -6,7 +6,7 @@
 additional-system-config=0-additional.conf
 additional-config=1-additional.conf
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 68f0f344523d8eff028b5744577f44a5d33f74a4..f6b94bb37ba92650e6ad26090bb2471f0b7768c1 100644 (file)
@@ -5,7 +5,7 @@
 [test-runner-config]
 additional-system-config=0-additional.conf 1-additional.conf
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 6a81c9a55f26ca2e22f2cd80daae2cb6ad66f4c3..9468330e62767c989edf9cab2a4c8fe03cea465b 100644 (file)
@@ -5,7 +5,7 @@
 [LightDM]
 guest-account-script=false
 
-[SeatDefaults]
+[Seat:*]
 autologin-guest=true
 user-session=default
 
index 10dfa03ecadf1a4aa169d0ee535efbd0b2011f4d..e8e1cc4fb44d59aad66cee50c245c372696188ce 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatically logs in guest while keeping a greeter up
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-guest=true
 autologin-in-background=true
 user-session=default
index 38d31e3fcd3f5d3e4dc3af9d0ad7641cdec8f02f..5904ad6db0a25c516cc62b6b7eea2ce4b4efadc8 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatically logs in default user
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-guest=true
 user-session=default
 
index 785abca0f5cc52375b27f61c2e7b55ba990c59d7..b4830ed33b9352f45d85abb6e8b0f16b93b48157 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatic guest sessions use configured session
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-guest=true
 user-session=default
 guest-session=alternative
index 52f8da1d63c4ba71236be591882b544484dfcf52..83bd7edb077a67777f5a9795cf49e142ea964c79 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatically logs in default user
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-guest=true
 autologin-user-timeout=99
 user-session=default
index 500fd66289f11dacb63cbf038c49ca26b81e4495..1f5f0b908a554afcdb357659e4f11fcaef8e0ed7 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatically logs in default user
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-guest=true
 user-session=default
 
index 4b89171dc54cd3adfb252931f22b7c890091b0af..73a5e4bc4e3a34cde52679779e6c4232e330531d 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatically logs in default user while keeping a greeter up
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 autologin-in-background=true
 user-session=default
index bf7a11179733c7f9ec35cf136257f2f0223e030d..519aca629c58be436b35bd00de82549fa569af4a 100644 (file)
@@ -2,7 +2,7 @@
 # Check quits if autologin session ends and no valid greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index bd480b30689009f5d667864517787dcb285876ea..ed38fd776a5ad83acd84e819d08791b28fcd1b24 100644 (file)
@@ -2,7 +2,7 @@
 # Check autologin fails if invalid session configured and returns to greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=invalid
 
index 527ce2c6881dc0da8c342a8fa3513547d669d4bc..4e1226fe8e4a2514ebf0dc2f815d1564ea7dfb83 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatically logs in default user
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=invalid
 
 #?*START-DAEMON
index 99bdb61f71bf3489886e336263af3e13c127bd4e..e8b13b07b40a4b7d00d3b30ccd730b3c6a1d088d 100644 (file)
@@ -2,7 +2,7 @@
 # Check logging out after autologin returns to greeter and doesn't autologin again
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index dfa7d83d4025fcc786760c3ac20c3d7aa9e9f767..2a3653da44a0985e54d5ecdcd12b114a0936bc18 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatic login stops if a password change is required
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=new-authtok
 user-session=default
 
index 2092ebb5f2a2f22ad7d3a5e8022edc8cb2a04b70..d9c7f7ce33d78c828571e68326f0ceb6045bed87 100644 (file)
@@ -2,7 +2,7 @@
 # Check we can configure the PAM service for automatic login
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=no-password1
 user-session=default
 pam-autologin-service=lightdm-autologin-alternative
index a42bcdfcb7c17de4c8af729b620cb103f5d9284c..d7e90463ea43677db48768b298a745dc277727a5 100644 (file)
@@ -2,7 +2,7 @@
 # Check we correctly use PAM for automatic login
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=no-password1
 user-session=default
 
index 22873bb409cc769c9312b460a98f00ec35a7f7c7..c48d444ceca6b3d08a238bbf6737222ceee34e1a 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatic login stops if an account prompts for a password
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=always-password
 user-session=default
 
index 3a3d616a81b05064fec6c2c58976b2a58e2f5657..b8baeefffc46a88421faba3e07e41f98dbdd98d7 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatically logs in and picks correct session
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-session
 
 #?*START-DAEMON
index ed687adb1aa1c90735d0d2306daf181e93fbceee..43ff74419d20e99acc133410063f8766056d4907 100644 (file)
@@ -2,7 +2,7 @@
 # Check if session crashes then returned to greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 743168cbb41e9c91088998345e9af699cfe7dae9..93e276451e4dcbd4d35f24b77398f05946a48494 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatic login stops if an account can't open a session
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=session-error
 user-session=default
 
index cababc8df8cdda970ab639d7df545a5665645bc8..a3f4fbdfba109c6a0c4a46cbe4c9f9eb8be8f613 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatically logs in default user with timeout and in-background set
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 autologin-user-timeout=99
 autologin-in-background=true
index 6961543139d54057b10eed216d7fcc722e44afb5..4d02099e20d0b8cfd636007a70a5187f79919134 100644 (file)
@@ -2,7 +2,7 @@
 # Check logging out after autologin returns to greeter and does timed login again
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 autologin-user-timeout=99
 user-session=default
index 2b13eb38d8d74a91c53a153c801e54c12b3e012c..d2d50ec925f7a785589d8f48872d6c01b4dafa4c 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatically logs in default user
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 autologin-user-timeout=99
 user-session=default
index a3d814999ae6ad1422d5b50d0673e0d477ae8ae8..19b0a26f318c3d1af728208a97b2cfd20345163c 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM returns to the greeter if the X server crashes inside a session
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 2c03f59c4667e621bd8d2459bc66ffbfe83a5f80..2982440cd6ce8cbde5453b95156aca5b83c67aac 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatically logs in default user
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index ac9ac828b53275e5a63a2fe74f00f610882362f7..97dccfb4bcfbef30113cba41da58dece4a90aad5 100644 (file)
@@ -5,7 +5,7 @@
 [test-runner-config]
 disable-login1=true
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 1c184f8c3376ddf7b24a64354201ac48c67a1e72..1b4adfbe73f259b27552ff9bacca12e4039365e9 100644 (file)
@@ -2,7 +2,7 @@
 # Check can login if existing corrupt authority present
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=corrupt-xauth
 user-session=default
 
index 045e5442938e6360bfc967d2a04023dcfbd39362..db3e1d98720a676e698b1ffb4aa4512b04988585 100644 (file)
@@ -2,7 +2,7 @@
 # Check authentication crash on autologin is handled
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=crash-authenticate
 user-session=default
 
index e5ab6d066341a338bd4c326e0910a663a61a259a..c18bb03fe4472a510d0631bfe24f31943b183fc7 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatic login stops if an account can't establish credentials
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=cred-error
 user-session=default
 
index 1c5e1b9fafd24f4c35429e1a27d2f4d215a8fa17..fc9e72dfef0c6acbab876bb261d6c1e806dd5e1d 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatic login stops if an account has expired credentials
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=cred-expired
 user-session=default
 
index 945d906f60dad6093938931cb6d4cc2e615b801c..a4badf337e48d58071bf983a4dee7b905ee245c9 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatic login stops if an account can't access credentials
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=cred-unavail
 user-session=default
 
index e38c9c092faa5434d66d25cb627372d6d6164ec9..e256d5c7630cc20fc66cef3a458923cc729a9186 100644 (file)
@@ -5,7 +5,7 @@
 [test-runner-config]
 log-dbus=true
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 0044e440764889efb7b253cdf569a3a26f348361..7673f9aca569c3ff19b98fa33893a0c1ac39bcac 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatic login stops if an account is denied access
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=denied
 user-session=default
 
index 9dba5acf73cfffe431d03b08993ad146e353c099..a611d1e83ae7c857a96ce8caac48b3d817993f7e 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatic login stops if an account is expired
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=expired
 user-session=default
 
index aca11a4ba40609aa77dcf4d0c3d543052cf643fd..099b5c3f0287b7893c099f7f4c93447bfd7efb5e 100644 (file)
@@ -2,7 +2,7 @@
 # Check greeter is informed if manual login should be showed (it defaults to show)
 #
 
-[SeatDefaults]
+[Seat:*]
 greeter-allow-guest=false
 
 #?*START-DAEMON
index 3fcb60343a1c724f97733f8295a66190261d715f..78d82f3f73d0836664bd7e4a5166ed6ad3be1217 100644 (file)
@@ -2,7 +2,7 @@
 # Check greeter is informed of the default user session
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=alternative
 
 #?*START-DAEMON
index 5a8f440f1272b1e0c9cc9df90c085c19a92b1cd1..97cd3544ebc37620804fa22d45de3798728dd523 100644 (file)
@@ -2,7 +2,7 @@
 # Check greeter is informed if user list should be hidden
 #
 
-[SeatDefaults]
+[Seat:*]
 greeter-hide-users=true
 
 #?*START-DAEMON
index 2e969d82577a8706fb2d3e1d1adecb2cc442794f..dedfe26e94cafb16b3c130f6b29e9aef7a7629bc 100644 (file)
@@ -2,7 +2,7 @@
 # Check greeter is informed if manual login should be showed
 #
 
-[SeatDefaults]
+[Seat:*]
 greeter-show-manual-login=true
 
 #?*START-DAEMON
index fb207233a43957319767fd19e9274e66facecaf4..4dca1edbc1aebd32394aa2af09f74d1399f01913 100644 (file)
@@ -2,7 +2,7 @@
 # Check greeter is informed if remote login should be showed (it defaults to show)
 #
 
-[SeatDefaults]
+[Seat:*]
 greeter-show-remote-login=false
 
 #?*START-DAEMON
index abf36aceaeaf7fc6ab2c2d5eab7e2e4adb6991d8..ce5cea38ddb3c683f08cd9a3e2039730620730ff 100644 (file)
@@ -2,7 +2,7 @@
 # Check greeter wrapper works
 #
 
-[SeatDefaults]
+[Seat:*]
 greeter-wrapper=test-greeter-wrapper
 
 #?*START-DAEMON
index f1e2a739d3aab56c37171184e471fb7c36bb62f7..d214031eae0d0b9ed4bf5e8be3fe3d070609f5aa 100644 (file)
@@ -2,7 +2,7 @@
 # Check group membership is correctly set up
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=group-member
 user-session=default
 
index 9a7aa0aaeab671816c1203470264bef33ad090b5..85c559f7feb5b5037ce88735311ce2df17881ad6 100644 (file)
@@ -2,7 +2,7 @@
 # Check guest wrapper works
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-guest=true
 user-session=default
 guest-wrapper=test-guest-wrapper
index 62f8296ee619383d85b6ea727782c8da542ed395..7317e862d2c9e2dbdfdc22f97be79f2c88058efb 100644 (file)
@@ -2,7 +2,7 @@
 # Check works for users who have their home directory created after authentication
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=mount-home-dir
 user-session=default
 
index dec662b254e61da14af69cd79d5fab9f775f04df..c986292628d97f462a92a9a3d3bc42230815194a 100644 (file)
@@ -2,7 +2,7 @@
 # Check works for users who have their home directory created when the session is opened
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=make-home-dir
 user-session=default
 
index 2f18924fcec17ec312cf6ae1a54187b3d8a321b8..c3e7396cd7ffc312769559fa93e4736ddefe72af 100644 (file)
@@ -2,7 +2,7 @@
 # Check language variables are set in session
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-language
 user-session=default
 
index 35d7cac8666ed485f0698e77cf51bdef4b8fbe0a..d9cb9ccb74103679c597681507f6471dc5b90d4b 100644 (file)
@@ -3,7 +3,7 @@
 # back to the user session and using the screensaver to unlock it.
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 61bd85408d20f9d3dd11245a02bc54bd7970964a..8381e513ae0b8a66a5a1368d95ecc22a463baa96 100644 (file)
@@ -5,7 +5,7 @@
 [test-runner-config]
 disable-login1=true
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 0bf3e5bc572890638d04b2c18b1ce033a3df9ae8..1c760920350ff1ee39fa91524db2dfce9d5ce3ef 100644 (file)
@@ -3,7 +3,7 @@
 # Uses a resettable greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 [test-greeter-config]
index fbe786ec044e95ae0aca9c6fc83939366d848cf2..b1b7615b3c99a9c3550bddc27adb1ffa1209bad8 100644 (file)
@@ -5,7 +5,7 @@
 [test-runner-config]
 disable-login1=true
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index caa39ea326672b4e567c1bf1f9d26ac2997bd54c..7564c5e37513bc20f209c4e409a53c0fe7db4d1c 100644 (file)
@@ -2,7 +2,7 @@
 # Check can lock a seat from D-Bus and can return to it
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index a1967a51cf40ab4b4537c60ed712fe9d2190fb6f..54de4d40cad45f290d342f37155bab036eaf5bcb 100644 (file)
@@ -2,7 +2,7 @@
 # Check can lock a seat from D-Bus
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 726bf78554f82021088b2c145c7909fa74644d14..ff92e9b4f6962a0b2d962f9572ffef0b8a0d41fd 100644 (file)
@@ -2,7 +2,7 @@
 # Check can lock a session from D-Bus. The session has no password so check it doesn't automatically log back in
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=no-password1
 user-session=default
 
index 21a1bc7fdb362b1f933004b70124174a8288f48a..db7bbe23cb1728219abe0d4c7ebbb51ad73e8edb 100644 (file)
@@ -3,7 +3,7 @@
 # Uses a resettable greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 [test-greeter-config]
index ce8c46fe70fbb9e49e733bb6f6f3b23116f88248..43196c4ef4484efd6857d1a18be4f3949b53990b 100644 (file)
@@ -2,7 +2,7 @@
 # Check can lock a session from D-Bus and can return to it
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index c274a44537729ac1b6d4623983de31a761389cf5..28c530ec2fd9bb61916fab8cea6c9297ac3e8e9e 100644 (file)
@@ -2,7 +2,7 @@
 # Check can lock a session from D-Bus
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 6cb33fe9c766fbaf8d5ad5ab3e765fc3cfc95593..0c15a6e8f61141903bce54a3e8ca4fed369a5957 100644 (file)
@@ -2,7 +2,7 @@
 # Check can't login to guest if account disabled
 #
 
-[SeatDefaults]
+[Seat:*]
 allow-guest=false
 
 #?*START-DAEMON
index e45fe6dc8ff5d5b9fa30cb6759ce4833fca10468..3cc232714276d10437533d3192690f47e7de204f 100644 (file)
@@ -5,7 +5,7 @@
 [LightDM]
 guest-account-script=false
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index f31e12780500def40495d9ea2168d4a0c7baeb2c..7db5e665fd3db697a48268a470c86479e62ce5e8 100644 (file)
@@ -2,7 +2,7 @@
 # Check automatically logs in default user
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 72ddd59cd6d4e0e959429668b7e4752a85aeb8fc..4685d25c02f4acca1668878ac397f4fd530d28cd 100644 (file)
@@ -2,7 +2,7 @@
 # Check can login as guest and pick an alternative session
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 9b0ca45c14c0cdc6286b2481940d300dbfb8ba79..261516eac998429b5582d2bca532ee0502373a60 100644 (file)
@@ -2,7 +2,7 @@
 # Check guest logins use configured session
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 guest-session=alternative
 
index fc3b7716f389289c8458463c9e1f5a9267b9dfb4..e2c7c5bc20697b9e08cbbc8d5ff2e7ddafd9b2d0 100644 (file)
@@ -2,7 +2,7 @@
 # Check can login as guest (not prompted for password)
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 3c2e8d0a1dc5282f4dfa6875eb6ddf25b39a3488..6d87b1fdcb67878d1b96b9924ab0025049e91286 100644 (file)
@@ -2,7 +2,7 @@
 # Check logging out returns to the greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index da9b03ff088e71420039ab86d304441cad5dd2d6..525441947ea1145c257585edc2b4052b4cb950c6 100644 (file)
@@ -2,7 +2,7 @@
 # Check can login without a username, and is prompted for one
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index d8e5d83f9b131e4ae23e557bc31a4a6719b4c12f..a17ef6d55c8abdae8a48ac8960772a0741d0cb20 100644 (file)
@@ -2,7 +2,7 @@
 # Check prompted to change password
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 0ecdf2e528257d82d3267af17955dd6e8f6fd1de..fa768fa442f890042bf57044463fef5cf9ef533a 100644 (file)
@@ -2,7 +2,7 @@
 # Check can login without password for accounts that do not have a password
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index bdc92426aab04a241275528c68aa2c7d892ea306..48199767cac4744c6c3f1a1e997cc9be903e1137 100644 (file)
@@ -2,7 +2,7 @@
 # Check we can configure the PAM service for login
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 pam-service=lightdm-alternative
 pam-greeter-service=lightdm-greeter-alternative
index 1cee123fc3d10e546f70b2a00691ae9a7d785ebd..c9d51f55f4f61c6e497864cb99886715aedf3637 100644 (file)
@@ -2,7 +2,7 @@
 # Check we correctly use PAM for login
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 [test-pam]
index edfcc9add882ef5c2cbccc74820ea35030086b68..978946441aa803e3f8a6b565655bed18c0edce67 100644 (file)
@@ -2,7 +2,7 @@
 # Check if session crashes then returned to greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index f57a4c0f07c8b69da5ffe4ef3797074c25b006fd..849ffb4bffb719cc22078402d81dbe9cfb34b1ba 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM returns to the greeter if the X server crashes inside a session
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 5e65fb24d740c9d1be816a3886f023c422f77066..def8b511bc71f6cbdf24703aa7eb22d0c1ee6e6a 100644 (file)
@@ -2,7 +2,7 @@
 # Check can login
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 1eea93738882fb3bb5968a23b3b4e96e493f4611..072aafa7e8488a16b66630a40f79d3eeed9a0014 100644 (file)
@@ -2,7 +2,7 @@
 # Check can automatically log into a Mir session from a VT based seat
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=mir
 
index cb259ac0ce07815325f2b5725931210f3cc7246b..1e32d5ec5ff9affcc4388115733642dd20ebf17d 100644 (file)
@@ -2,7 +2,7 @@
 # Check can login into a containerised Mir session on a VT based seat
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=mir-container
 
 #?*START-DAEMON
index 59e5a38f0d4c0b29df17359aa6c3b577a48093e8..63dec80312edc575042b758f06d89fe8b8bf7e9c 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM runs the script hooks correctly for autologin and the greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 display-setup-script=test-script-hook DISPLAY-SETUP
 display-stopped-script=test-script-hook DISPLAY-STOPPED
 greeter-setup-script=test-script-hook GREETER-SETUP
index 73e965d7e95d140ebe8053b180cc7c90398b35f0..1bdd0b4c120d5c4a8a4b3660b4a1c1cea29b9cad 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM returns to the greeter if the unity compositor crashes inside a session
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=mir
 
index d7227ac2e03e3f061f631c3d564cf432c56c7751..369b3c3333a35cb978a9cf932cece6922f97316e 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM returns to the greeter if the Mir session crashes
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=mir
 
index 699137a7be63aa89816bf2b503bda404c6e44d2b..6c192f3ba95033f4554a5a1454458d40781ff989 100644 (file)
@@ -2,7 +2,7 @@
 # Check can login into a Mir session on a VT based seat
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=mir
 
 #?*START-DAEMON
index 4a0324f2bdb614d72195075440d1457557ac225c..d34b0a0cb7205552c59dc9800782a83ba0103e5d 100644 (file)
@@ -5,7 +5,7 @@
 [test-runner-config]
 disable-accounts-service=true
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 4449fd5f79164177b22873b4a93635dd625de1f4..5fd190f150123f384ff487bffdd8b2d5397d9b03 100644 (file)
@@ -6,7 +6,7 @@
 disable-console-kit=true
 disable-login1=true
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index ae08ddcd65eded4710304331fc3768434a89c55b..4321d1685080aaae8c26e5ffb36398c7ac67c996 100644 (file)
@@ -5,7 +5,7 @@
 [test-runner-config]
 disable-console-kit=true
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 4a283038391b640ce6389f0c5cd6c98cbc710b51..0a27779fed1c6323ae707be92068936e851455e8 100644 (file)
@@ -5,7 +5,7 @@
 [test-runner-config]
 disable-login1=true
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 4e8dfd78b76e9a5ed42566a78f7375c5f8d674bd..c57f0fcd239a8f5c06db5ca211281292a1f63fa9 100644 (file)
@@ -3,7 +3,7 @@
 # Use a greeter so its file descriptors are around at the time the session starts.
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 903f82afcd2c3e68be43e6703faaeb0402e89c25..8807adb8c8f32772d06b7bfc47d3531f6a863578 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM stops if the display setup script returns an error
 #
 
-[SeatDefaults]
+[Seat:*]
 display-setup-script=test-script-hook DISPLAY-SETUP 1
 
 #?*START-DAEMON
index 06ebd06e001f7cc7a58da8c42a87025d99f0d7bd..6903331c10469ed6edbeebdf44a027404c3a2cfb 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM stops if the display setup script is missing
 #
 
-[SeatDefaults]
+[Seat:*]
 display-setup-script=test-script-hook-INVALID
 
 #?*START-DAEMON
index 1c377028e7210ef1bdc630a1a54288c1c8d330d3..ee483a49a7276b6c7d27f87dd9ec9895a7f489b2 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM stops if the greeter setup script returns an error
 #
 
-[SeatDefaults]
+[Seat:*]
 greeter-setup-script=test-script-hook GREETER-SETUP 1
 
 #?*START-DAEMON
index 939ff35d15af982b7d7f7beec243ba13a2c90824..2599b60617659c4188ed9202f88424d8ef64ddb1 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM stops if the greeter setup script is missing
 #
 
-[SeatDefaults]
+[Seat:*]
 greeter-setup-script=test-script-hook-INVALID
 
 #?*START-DAEMON
index de856ae1168d535225279dac6a593a3653b530e0..5669d4255152d540fd9bedf60c6b499bab818d68 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM returns to the greeter if the session setup script fails
 #
 
-[SeatDefaults]
+[Seat:*]
 session-setup-script=test-script-hook SESSION-SETUP 1
 autologin-user=have-password1
 user-session=default
index 4e359330b818d2c5ab3cd2860ff91c439afc1b7e..c3635f8f4dc31ff1b2247d4065b8bd402bb3f280 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM returns to the greeter if the session setup script is missing
 #
 
-[SeatDefaults]
+[Seat:*]
 session-setup-script=test-script-hook-INVALID
 autologin-user=have-password1
 user-session=default
index 89e72f4de98f2c5803526431335ef11fa5437901..a159428c00dca1412c2effecd7c86b5d9dbde2e1 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM runs the script hooks correctly for autologin and the greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 display-setup-script=test-script-hook DISPLAY-SETUP
 display-stopped-script=test-script-hook DISPLAY-STOPPED
 greeter-setup-script=test-script-hook GREETER-SETUP
diff --git a/tests/scripts/seatdefaults-still-supported.conf b/tests/scripts/seatdefaults-still-supported.conf
new file mode 100644 (file)
index 0000000..1af1972
--- /dev/null
@@ -0,0 +1,30 @@
+#
+# Check LightDM still supports (now deprecated) config section [SeatDefaults]
+#
+
+[SeatDefaults]
+autologin-user=have-password1
+user-session=default
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
index f40e977bc11081bd23648ce0b40cf0357a9a57a2..10cfde80b1549d75ab9f5b3f2880449f21abe9d0 100644 (file)
@@ -2,7 +2,7 @@
 # Check session log is backed up and restart on second login
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=no-password1
 user-session=default
 
index d0a33ecb23c140e43e64af6f8c37b481dea1c5bc..26fc36bf0b10742c3c26184ef3e524e24876b9f7 100644 (file)
@@ -2,7 +2,7 @@
 # Check session stderr is written to ~/.xsession-errors and multiple writes are appended
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 3f0b098fa167e15c70c457c3ac5b306cdbfcd0ae..b7140d7fbb5b94e7555dde196ef491140b1507e6 100644 (file)
@@ -2,7 +2,7 @@
 # Check session stderr is written to ~/.xsession-errors
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 86175f56356bb543f4a3ca754ed8fa98c8e089f3..745791b6b65ec5a3fc86f0324be516cbbde93c82 100644 (file)
@@ -2,7 +2,7 @@
 # Check session stdout is not written anywhere
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index e4fa987c60510bdc9ab60da086b1b4613c96de09..0e275619e1a4262b800bae341c27f07b5b0321b8 100644 (file)
@@ -2,7 +2,7 @@
 # Make sure we can make a shared data directory to write from the greeter to the session
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 281418d7ffd8c6ea5a5f7ec0bdf5464d29974364..83a8d81a0f39e7bef0c89c9d91d543b1de82e779 100644 (file)
@@ -2,7 +2,7 @@
 # Make sure a shared data directory is created on autologin and can be written back to the greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 9cadd93b06b305d1efe8ec1e3934c907982d6632..93868b81e007b92478b37d272ed55139b12c58db 100644 (file)
@@ -2,7 +2,7 @@
 # Make sure a shared data directory is created on login and can be written back to the greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 23634f1b449073f0a498032af42682a6a5562781..55c8cc50aa824219b08620e45936640d02154893 100644 (file)
@@ -2,7 +2,7 @@
 # Check can't switch to greeter when disabled
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 allow-user-switching=false
index 73427a4a8ac84c07e64ebbc561b5ab1c3cd6b7f8..7ee5a5ec0627d072b6d3e63144b3f6e5120f0f16 100644 (file)
@@ -2,7 +2,7 @@
 # Use D-Bus interface to show the greeter, then start a new session
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 7f35f118eccdb08733a2cbe475d3f7a5368b75a4..d7dd9a40e30abb6877b6ca4a7b89632a37e8c585 100644 (file)
@@ -3,7 +3,7 @@
 # Uses a resettable greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 allow-guest=false
 user-session=default
 
index 4d29c2c5e7339428b56a254f82b3c9705a37da1b..1f5c01a17a4237fb21b18b771d9c9b3153af5920 100644 (file)
@@ -2,7 +2,7 @@
 # Use D-Bus interface to show the greeter, then return to the same session, then logout
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index ea2c2e3d01a361ff1a291a3cd0e68560852c172d..7e79e57f22b0ff44657cbfbb68e1def1e3de09b8 100644 (file)
@@ -2,7 +2,7 @@
 # Check we correctly use PAM for returning to an existing session
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 292aa77f0791a1b77e60bea593274fddd4fbd465..2a257363396330ed4f2271ed1eab4d752ac0de46 100644 (file)
@@ -2,7 +2,7 @@
 # Use D-Bus interface to show the greeter, then return to the same session
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index e3f6f752a8a003f26876387d348627c5b517480e..6e7fe18be8b79f66e4d0d8f74dfe3c0ce870c2d9 100644 (file)
@@ -2,7 +2,7 @@
 # Use D-Bus interface to show the greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index ceca70967bed3a2859f8907516e07e99e17d9523..9bb2fae3c5453093d8e1e41d9f5e4ed690b96af5 100644 (file)
@@ -2,7 +2,7 @@
 # Check can't switch to guest when disabled
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 allow-user-switching=false
index 655e4d771a92647a76665f0d27765b256705d52d..23d3d093d214c34204ede760ca71d69dddfe5994 100644 (file)
@@ -6,7 +6,7 @@
 [LightDM]
 guest-account-script=false
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 [test-greeter-config]
index cc59cca10131ba9dac36043a1795d21d191feb89..02df3fd442de81f161b3d8da026cca8c3f677eba 100644 (file)
@@ -2,7 +2,7 @@
 # Check D-Bus interface can trigger/switch to guest session
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 68d0dcdd6443387c684f80fe2263fa41b0609902..bed3938a0e63614b372f338847c69bd8f3abf9d5 100644 (file)
@@ -2,7 +2,7 @@
 # Check that switching to a user who is the active session does nothing
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=no-password1
 user-session=default
 
index c3fbc6b581a7adee40103ccda2244545abdf470c..fecc6472a54aabbbe4861e47c71b3882d77d2bbd 100644 (file)
@@ -2,7 +2,7 @@
 # Check that can't switch to a user when switching disabled
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=no-password1
 user-session=default
 allow-user-switching=false
index ba80414b8306b2b72a2b47a1bb83d0ab28e805b8..542e5952e8d7b5dd452e8ff1fe67bc2984898117 100644 (file)
@@ -2,7 +2,7 @@
 # Check that switching to an existing account with no password switches straight back
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=no-password1
 user-session=default
 
index cc7bd6d05211c063dab2ba89206a7236dbb223b5..8c2c74b94fd73a81b6962cf22cef4fd721212d53 100644 (file)
@@ -3,7 +3,7 @@
 # Uses a resettable greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 [test-greeter-config]
index 23f9101fc0884ba70edb5bf7e28d54f89eb9dab9..574780088174c28de8281d4ac22b5ad7673ba187 100644 (file)
@@ -2,7 +2,7 @@
 # Check that switching to an existing account with a password shows the greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 68fe22fa86647e73b8f56ce98ca405f5e981729a..7afc8014d86c8d91ae0bc0c8ed9aefb1fd802550 100644 (file)
@@ -3,7 +3,7 @@
 # Uses a resettable greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 [test-greeter-config]
index 784aa0e7f4c6fa66ff23172ae583dd9a45f62bec..2dabc0351bfebd24905463ffa7dfee3d5c42f76c 100644 (file)
@@ -2,7 +2,7 @@
 # Check that switching to a user and logging out the active session starts a greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=no-password1
 user-session=default
 
index 3e619811c6585a9852f9fb236deaec08b3b50588..a9e9bb3ad31b0383ebfb8d5c98302fcfcbc9f950 100644 (file)
@@ -2,7 +2,7 @@
 # Check that switching to a user and logging out the inactive session does nothing
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=no-password1
 user-session=default
 
index 2067aea9d876bea558012fe02738f35f312a6815..1e3ce19b56f924acbaa807825c5e885145cb87ad 100644 (file)
@@ -2,7 +2,7 @@
 # Check that switching to a user without a password doesn't show a greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 24b5f72fc7c4e29abf94d2290425e13047304aeb..17ea1efd7b3dadd47c472c81da9c28ecbead88a2 100644 (file)
@@ -3,7 +3,7 @@
 # Uses a resettable greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 [test-greeter-config]
index 5789af4c47013e6556d05205b0c6a65358e9aa00..10ec20bf490e81436dbdc575d3cbe15ef1abbeb3 100644 (file)
@@ -2,7 +2,7 @@
 # Check that switching to a user shows the greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=no-password1
 user-session=default
 
index ec2c2223c03194db82a2dc36da34a4e9577a633c..725f6329e31c18fd166a0155b30ca769aaabe04a 100644 (file)
@@ -2,7 +2,7 @@
 # Check that switching to multiple users works
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index f0212cf1c34a53819d46c79b0bd855df6b621c2f..b9dd4e5e15d4f547a457ef353251eb6b96832f33 100644 (file)
@@ -5,7 +5,7 @@
 [LightDM]
 user-authority-in-system-dir=true
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 63a99702067296df7f8cf37653558c0a8b2055de..5df08807e49465220ee42b21d5a893c2d2bad0a6 100644 (file)
@@ -2,7 +2,7 @@
 # Check can automatically login with Unity seat type
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 autologin-user=have-password1
 user-session=default
index ab4d06c5243677e1a0772f4dbf8eaab0e7133ac0..dfdede5ee9468fddb9fd828048ab21b4d6b4d5fe 100644 (file)
@@ -2,7 +2,7 @@
 # Check can set the unity compositor command
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 user-session=default
 unity-compositor-command=unity-system-compositor --test
index 0994fd78b6ebe94d038631663d85d5cbdaae9879..8557e731f492acbb20ca6104fd1ca02152931abc 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM ? if the compositor crashes
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 
 #?*START-DAEMON
index 3d2cc6acfaa04f188ee0b3d8b4fd66d9fda93558..d272efe5580dedaac92d0d4a12c16391616bc031 100644 (file)
@@ -2,7 +2,7 @@
 # Check clean stop when the compositor fails to indicate it is ready
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 unity-compositor-timeout=1
 
index 84a37aa40509e5323d5c60b6d53987d5a163708c..254bddf810e46fcb22fd986fdfd7fff377bf2f30 100644 (file)
@@ -5,7 +5,7 @@
 [unity-system-compositor-config]
 return-value=1
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 
 #?*START-DAEMON
index e6033da5ad6f00ef30b96755771f9457935343c4..22f68a03f4e77a11c271ef477bf014ee7c03ca43 100644 (file)
@@ -5,7 +5,7 @@
 [unity-system-compositor-config]
 return-value=1
 
-[SeatDefaults]
+[Seat:*]
 type=unity;INVALID;unity;xlocal;
 
 #?*START-DAEMON
index c2bd8e5fdfd12cc47e1ddeec41106a027e9eb734..48cc2301ce0be5c62fca3b2a480774062910ecd4 100644 (file)
@@ -2,7 +2,7 @@
 # Check that we correctly set next session when switching selected greeter user in Mir
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 user-session=mir
 autologin-user=have-password2
index 6e7396e66548e3bffbfbf432ad3b4a41c9426a62..b8c8b1c420f3eeddd0504d80714d87ba8bb041cd 100644 (file)
@@ -2,7 +2,7 @@
 # Check that we correctly set next session when switching selected greeter user
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 user-session=default
 autologin-user=have-password2
index ea33960a7527838f976e744c4b4e6d4dde5a048a..04078d5551c6940bb06100e523b5b1d71a66b6e4 100644 (file)
@@ -2,7 +2,7 @@
 # Check can set the unity compositor command
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 user-session=default
 unity-compositor-command=unity-system-compositor-INVALID
index 74e8dac7f4cff3180255603f47495ed4196d7550..00ca640c7857f3e23b4ce4856695a5675cea7b77 100644 (file)
@@ -2,7 +2,7 @@
 # Check can login with Unity seat type
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 user-session=default
 
index b71c4ba0ed253e2f95721a6911b5a7b373ce0093..d56c25ea57b339211d48b57844b699e28596b6da 100644 (file)
@@ -2,7 +2,7 @@
 # Check can automatically log into a Mir session
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 autologin-user=have-password1
 user-session=mir
index 5db4a20802208686efbcccee32d84f6d799fa433..cdfa832daadbdbef79edccb9b2880f1cef55cbf7 100644 (file)
@@ -2,7 +2,7 @@
 # Check can log into a Mir session from a Mir greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 user-session=mir
 
index 1aeda18c1215264e9e01a793d7da80f84363ccf0..d96ebbb116a072c05940dec8e34745dcce58efc5 100644 (file)
@@ -2,7 +2,7 @@
 # Check can log into an X session from a Mir greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 user-session=default
 
index 2b36bf7b3a8594a4e3b9e580f5192f029507a4e9..7f89ec00a025082391fab31a8af413f1b012ea19 100644 (file)
@@ -2,7 +2,7 @@
 # Check can lock a seat from D-Bus with Mir
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 type=unity
 user-session=mir
index dbf6e68ea1e8a9c7f3125144c9dcb9ef9bb0d3a7..39e2a81d640a0b230880f5d20bdd5e0f4169a86b 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM runs the script hooks correctly for autologin and the greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 display-setup-script=test-script-hook DISPLAY-SETUP
 display-stopped-script=test-script-hook DISPLAY-STOPPED
index 7937d86fc2c49330b83b443289a49b2e8ea1cfc2..046aa578c0eba14b31285b99754fe96953f21038 100644 (file)
@@ -2,7 +2,7 @@
 # Check can log into a Mir session from an X greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 user-session=mir
 
index e59d70cc2798fec50eeb7bd6a7464f5df368feda..1da8b24422d2afc7c045c8cb406fb25b37b51cbd 100644 (file)
@@ -3,7 +3,7 @@
 # Uses a resettable greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 user-session=mir
 
index 5a95e08e6a780f1d223e0684220af372ea525f1f..82f04e088d94a81097ff953ba3f78402571d38a6 100644 (file)
@@ -2,7 +2,7 @@
 # Check system compositor correctly switches Mir sessions
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 autologin-user=have-password1
 user-session=mir
index feae1adfe7f592f4468ee59c0fb39c84c87c7d9f..66f3b637bff4c7a297bdab2524c824342fd94440 100644 (file)
@@ -2,7 +2,7 @@
 # Check Plymouth quits when Unity System compositor server is started.  Plymouth is on an active VT so it handshakes with u-s-c.
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 autologin-user=have-password1
 user-session=default
index 4db13cfbcc2b42527c714d2d71c3344c227c6bff..bad4a70e83815e0b8eb0fe3a6b4a7ca98c19d9f8 100644 (file)
@@ -2,7 +2,7 @@
 # Check LightDM runs the script hooks correctly for autologin and the greeter
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 display-setup-script=test-script-hook DISPLAY-SETUP
 display-stopped-script=test-script-hook DISPLAY-STOPPED
index 7444f25f82958480a95bcb164efc4ad2b8edd967..d63416ea8ab00ef750b625b06a46a6b5b7bcf630 100644 (file)
@@ -2,7 +2,7 @@
 # Check system compositor correctly switches X sessions
 #
 
-[SeatDefaults]
+[Seat:*]
 type=unity
 autologin-user=have-password1
 user-session=default
index 6ca6b407bd8cd6d2e779395352f4efae6bf0f2d4..c9a9cf0ff29a4a5a49e8635cd62b707ce262f752 100644 (file)
@@ -2,7 +2,7 @@
 # Check emits upstart events on autologin
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index d6214e95ec1266b442e54bce9b9faecbd39c4cda..1730e464597705c529bc7ea3f0cd63478deaefe1 100644 (file)
@@ -2,7 +2,7 @@
 # Check emits upstart events on login
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 [test-initctl-config]
index 1a3a12b23d3f5f773df8bcde0d3a4b3effdbbd9a..1f9a8b6bef03a26cd9eb217aa6485ef8c31b2935 100644 (file)
@@ -2,7 +2,7 @@
 # Check user marked as logged in
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 [test-greeter-config]
index c17ceddc99df6c1acd5f62ec628d55f10a2a7636..6d6eeada9e9ab6fa0377322c77f09fea7ece98e2 100644 (file)
@@ -2,7 +2,7 @@
 # Check if PAM renames the user to one that doesn't exist lightdm handles this
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=change-user-invalid
 user-session=default
 
index 38e329e9ad2301c35418e9c1a57869bfb5a86e7c..1680fedb7ec0547bc99245f6ac5147acf116aa66 100644 (file)
@@ -2,7 +2,7 @@
 # Check if PAM renames the user then lightdm detects this and uses the new user account
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=change-user1
 user-session=default
 
index 8d04922422910eeba5338d9953820dc7b711f7fd..59ea05a78b9db71a14112ec5ee79de3735342d2b 100644 (file)
@@ -2,7 +2,7 @@
 # Check get correct user session
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 [test-greeter-config]
index e3ae2591aae5727f5171ac0aa5af256b5db46407..5b243d951e2860d3a36e32097f31252dd3d512e7 100644 (file)
@@ -5,7 +5,7 @@
 [test-utmp-config]
 check-events=true
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 24c03314d63d2b018b3a83b654b010ef08946d5e..213afb1529fa4c131d4d441fcc7de793a52226cf 100644 (file)
@@ -5,7 +5,7 @@
 [test-utmp-config]
 check-events=true
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 820b2324f687b5e3f69b7085d6013c38d317dfc0..10549d93ee9c8cbcd34c8284952890b38fd574d4 100644 (file)
@@ -8,7 +8,7 @@ start-default-seat=false
 [VNCServer]
 enabled=true
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 793399732619e15cd2865c076afe48006eb90e7e..63d951ebc430724321e3485efadd16c7f9544015 100644 (file)
@@ -8,7 +8,7 @@ start-default-seat=false
 [VNCServer]
 enabled=true
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index d77582c641d9d800c7c3bba7d38720996910c0b4..454e449bf713d75a896bad993edcc2ba34b57d26 100644 (file)
@@ -8,7 +8,7 @@ start-default-seat=false
 [VNCServer]
 enabled=true
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 3439aa6004911bc652d80ed5174ac19969e28674..c173aa39a4776874c77b4ccc99e8dd3faf3a7d4d 100644 (file)
@@ -2,7 +2,7 @@
 # Check X authority written into home directory
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=default
 
index 1e0128840eb894edab6709480bdb14f43ae64da3..344e7667adab85dcc1992d95f813286ebcd32716 100644 (file)
@@ -2,7 +2,7 @@
 # Check XDG_CURRENT_DESKTOP is set for sessions that support it using the legacy key name
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=named-legacy
 
index 00f6d8a330b49b81ee3f2b0351b0a78175a3acc4..c09f3dcb31cf7b2bf51c3297b9b5b1bc998c18d8 100644 (file)
@@ -2,7 +2,7 @@
 # Check XDG_CURRENT_DESKTOP is set for sessions that support it
 #
 
-[SeatDefaults]
+[Seat:*]
 autologin-user=have-password1
 user-session=named
 
index e700a7c0da8ef0d0bab5f2b633e7a6056077526a..b24860a9c6ab6ca78a77dfe2efbe8854251b22c6 100644 (file)
@@ -2,7 +2,7 @@
 # Check can run a local XDMCP client
 #
 
-[SeatDefaults]
+[Seat:*]
 xdmcp-manager=127.0.0.1
 
 #?*START-DAEMON
index dd4308db4dd27a02c3daaa16fe200b1db405fbf4..dd7a9502bc4774a3dcb48157b013eb7b27e1d41c 100644 (file)
@@ -8,7 +8,7 @@ start-default-seat=false
 [XDMCPServer]
 enabled=true
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 autologin-user=have-password1
 
index e64541af41ce7b9c05e9154f19041c542a50e294..552f4be78118b97312909a1cbe730db3ecd473f9 100644 (file)
@@ -8,7 +8,7 @@ start-default-seat=false
 [XDMCPServer]
 enabled=true
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 9553a49df5c73f5289ccd72edd7310e0372da774..1fb8869fb601c5283510d5f77622986e621b1fbe 100644 (file)
@@ -8,7 +8,7 @@ start-default-seat=false
 [XDMCPServer]
 enabled=true
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index c2e25b0fd59e2d920e9a009845a22468cbb9b996..c73f855d953787a8387d5ebfe84efb878e1f61bc 100644 (file)
@@ -8,7 +8,7 @@ start-default-seat=false
 [XDMCPServer]
 enabled=true
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 670701dc4ba23bd14029bd5b94d00771be99072a..28719e7c1fa138edd3f9d4c6a224d73ff6edfd8e 100644 (file)
@@ -8,7 +8,7 @@ start-default-seat=false
 [XDMCPServer]
 enabled=true
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 
 #?*START-DAEMON
index 922a56f934188d7cfeb5e381e7a40410a078fd1c..b3b46a83e3260f9dbd97eedd0088d38461f7bdbd 100644 (file)
@@ -2,7 +2,7 @@
 # Check can configure a new X server to start for the session
 #
 
-[SeatDefaults]
+[Seat:*]
 user-session=default
 xserver-share=false
 
index a5cbb37fbff705bac6d747aa68818632a40a2bfc..97791d16688592fc208d9d8e976a7a1010bf57ba 100644 (file)
@@ -1222,6 +1222,8 @@ pam_authenticate (pam_handle_t *pamh, int flags)
             result = pamh->conversation.conv (1, (const struct pam_message **) msg, &resp, pamh->conversation.appdata_ptr);
             free (msg[0]);
             free (msg);
+            if (result != PAM_SUCCESS)
+                return result;
 
             if (resp == NULL)
                 return PAM_CONV_ERR;
index e66dead8f7b8ce1bf2837423b4d7bfaeaf728459..fad4b74633f733ebf27d5f06c29ddc7d35c33c1f 100644 (file)
@@ -139,6 +139,7 @@ static GList *status_clients = NULL;
 
 static void ready (void);
 static void quit (int status);
+static gboolean status_timeout_cb (gpointer data);
 static void check_status (const gchar *status);
 static AccountsUser *get_accounts_user_by_uid (guint uid);
 static AccountsUser *get_accounts_user_by_name (const gchar *username);
@@ -522,11 +523,25 @@ handle_command (const gchar *command)
     }
     else if (strcmp (name, "WAIT") == 0)
     {
+        const gchar *v;
+        int duration;
+
+        /* Stop status timeout */
+        if (status_timeout)
+            g_source_remove (status_timeout);
+
         /* Use a main loop so that our DBus functions are still responsive */
         GMainLoop *loop = g_main_loop_new (NULL, FALSE);
-        g_timeout_add_seconds (1, stop_loop, loop);
+        v = g_hash_table_lookup (params, "DURATION");
+        duration = v ? atoi (v) : 1;
+        if (duration < 1)
+            duration = 1;
+        g_timeout_add_seconds (duration, stop_loop, loop);
         g_main_loop_run (loop);
         g_main_loop_unref (loop);
+
+        /* Restart status timeout */
+        status_timeout = g_timeout_add (status_timeout_ms, status_timeout_cb, NULL);
     }
     else if (strcmp (name, "ADD-SEAT") == 0)
     {
@@ -892,17 +907,18 @@ handle_command (const gchar *command)
                 user->xsession = g_strdup (g_hash_table_lookup (params, "SESSION"));
                 g_string_append_printf (status_text, " SESSION=%s", user->xsession);
             }
+
+            g_dbus_connection_emit_signal (accounts_connection,
+                                           NULL,
+                                           user->path,
+                                           "org.freedesktop.Accounts.User",
+                                           "Changed",
+                                           g_variant_new ("()"),
+                                           &error);
         }
         else
             g_warning ("Unknown user %s", username);
 
-        g_dbus_connection_emit_signal (accounts_connection,
-                                       NULL,
-                                       user->path,
-                                       "org.freedesktop.Accounts.User",
-                                       "Changed",
-                                       g_variant_new ("()"),
-                                       &error);
         if (error)
             g_warning ("Failed to emit Changed: %s", error->message);
         g_clear_error (&error);
index f14cdf9c7d4751640e65aab66b161ccc1a5d2d5a..15f68622751805ee8c8824e97db169b466077800 100644 (file)
@@ -57,7 +57,8 @@ write_message (guint16 id, const guint8 *payload, guint16 payload_length)
     data[1] = id & 0xFF;
     data[2] = payload_length >> 8;
     data[3] = payload_length & 0xFF;
-    memcpy (data + 4, payload, payload_length);
+    if (payload)
+        memcpy (data + 4, payload, payload_length);
 
     if (write (to_dm_fd, data, data_length) < 0)
         fprintf (stderr, "Failed to write to daemon: %s\n", strerror (errno));
diff --git a/tests/test-seatdefaults-still-supported b/tests/test-seatdefaults-still-supported
new file mode 100755 (executable)
index 0000000..165e19e
--- /dev/null
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner seatdefaults-still-supported test-gobject-greeter